Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stash session and credentials during copilot access #52980

Merged
merged 3 commits into from
Dec 10, 2024

Conversation

dangrous
Copy link
Contributor

@dangrous dangrous commented Nov 22, 2024

Explanation of Change

This will allow us to remove the code removed in https://github.com/Expensify/Web-Expensify/pull/44547, but should not yet require that change. However, please test with and without that backend change locally (I did too but just to be safe)

Fixed Issues

$ #51042
PROPOSAL:

Tests

Internally - please do the following

  1. Update your authtokens to expire after a short period (e.g. 20 seconds) here - I don't remember which one of these is the one that matters so you can update both to be safe

  2. As noted above please double check this works with and without https://github.com/Expensify/Web-Expensify/pull/44547.

  3. This can also be tested on Hybrid App with https://github.com/Expensify/Mobile-Expensify/pull/13289 - you don't need to do that here I don't think, but calling out that I did do that :)

  4. Create an account, verify it (log out and back in again) and add a copilot

  5. Log in as that copilot

  6. Copilot into the original account

  7. Verify that everything seems to work fine (requests go through, etc.)

  8. Switch back to the copilot's original account

  9. Verify that everything seems to work fine (requests go through, etc.)

  10. Wait 20 seconds (or however long you set your authtokens to expire)

  11. Do some more actions, and check for the Authenticate call to go through successfully.

  12. Verify that everything seems to work fine

  13. Repeat steps 3-9 (just to make sure that nothing goes weird with the copilot tokens).

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  1. Create an account, verify it (log out and back in again) and add a copilot
  2. Log in as that copilot
  3. Copilot into the original account
  4. Verify that everything seems to work fine (requests go through, etc.)
  5. Switch back to the copilot's original account
  6. Verify that everything seems to work fine (requests go through, etc.)
  7. Repeat steps 3-6 once.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

2024-11-25_14-56-20.mp4
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@dangrous dangrous self-assigned this Nov 22, 2024
@dangrous
Copy link
Contributor Author

Okay, this looks like it works properly with https://github.com/Expensify/Mobile-Expensify/pull/13289 and the web-e / backend changes!

@dangrous dangrous marked this pull request as ready for review November 25, 2024 19:57
@dangrous dangrous requested a review from a team as a code owner November 25, 2024 19:57
@melvin-bot melvin-bot bot requested review from mollfpr and removed request for a team November 25, 2024 19:57
Copy link

melvin-bot bot commented Nov 25, 2024

@mollfpr Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes seem straightforward, but I can't test them since it need internal access. So I'm gonna approve it to pull someone internal.

@melvin-bot melvin-bot bot requested a review from blimpich November 26, 2024 07:50
Copy link

melvin-bot bot commented Nov 26, 2024

@blimpich Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@dangrous
Copy link
Contributor Author

thanks @mollfpr! Yes unfortunately not something external folks can help with yet. @blimpich - let me know if you have any questions!

@dangrous
Copy link
Contributor Author

dangrous commented Dec 2, 2024

Hey @mollfpr so I talked with @blimpich - do you think you could actually test this against the existing backend, and then, to test against the new backend changes we can sync up and I can give you an ngrok URL to my backend? Let me know!

@mollfpr
Copy link
Contributor

mollfpr commented Dec 2, 2024

@dangrous Sure! I'll let you know when I'm finish the test with current BE.

@blimpich blimpich requested a review from mollfpr December 2, 2024 18:33
@dangrous
Copy link
Contributor Author

dangrous commented Dec 5, 2024

How are we looking on this one @mollfpr ? Thanks!

@mollfpr
Copy link
Contributor

mollfpr commented Dec 5, 2024

I'm going to test it now! Sorry for the delay 🙏

@mollfpr
Copy link
Contributor

mollfpr commented Dec 5, 2024

@dangrous Looks good! Although, I got logout when switch back to copilot account but I only experience it once.

Screen.Recording.2024-12-05.at.23.18.41.mp4

Do you want to proceed with test the BE changes?

@dangrous
Copy link
Contributor Author

dangrous commented Dec 5, 2024

Hm, weird - I wonder if that's just something with the site issues we're having right now. I guess we can move forward, and if you notice that come up again let me know!

I'll get my backend prepped with the necessary changes and ping you in Slack with an .env file you can use to connect.

@mollfpr
Copy link
Contributor

mollfpr commented Dec 6, 2024

@dangrous I got an Onyx error after signing in.

Screenshot 2024-12-06 at 20 34 28

The report_ data has onyxMethod setcollection which is not a valid onyx method in onyx. I try to verify with the response on staging, and it has onyxMethod and mergecollection instead.

Screenshot 2024-12-06 at 20 36 32

@mollfpr
Copy link
Contributor

mollfpr commented Dec 6, 2024

I'm able to modify the onyx so the error won't be raised. Continue to testing!

@mollfpr
Copy link
Contributor

mollfpr commented Dec 6, 2024

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
52980.Android2.mp4
Android: mWeb Chrome
52980.mWeb-Chrome2.mp4
iOS: Native
52980.iOS2.mp4
iOS: mWeb Safari
52980.mWeb-Safari2.mp4
MacOS: Chrome / Safari
52980.Web2.mp4
MacOS: Desktop
52980.Desktop2.mp4

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@melvin-bot melvin-bot bot requested a review from Beamanator December 6, 2024 15:40
Copy link

melvin-bot bot commented Dec 6, 2024

@Beamanator Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@dangrous
Copy link
Contributor Author

dangrous commented Dec 6, 2024

Thanks @mollfpr! To confirm about the set/merge thing - is that something I need to look into changing in my back end PR? Or is it resolved?

@mollfpr
Copy link
Contributor

mollfpr commented Dec 6, 2024

is that something I need to look into changing in my back end PR?

@dangrous Probably yes.

Interestingly, we have setcollection method in react-native-onyx.

https://github.com/Expensify/react-native-onyx/blob/5f4bf772aadb581bbe87d983a56d933e4cd9b55d/lib/OnyxUtils.ts#L39-L46

We have bumped the package #53148. I think we can resolve the issue with pulled the latest main.

@dangrous
Copy link
Contributor Author

dangrous commented Dec 9, 2024

Cool, I've merged main in both front and back end. Do you think we need to retest, or are we good for final approval from @blimpich (or @Beamanator who seems to have been auto-added unnecessarily)?

I misread your initial message too, the error is on sign in not related code.

@mollfpr
Copy link
Contributor

mollfpr commented Dec 10, 2024

@dangrous I think it's good for final approval since it's not related to the issue changes.

@dangrous
Copy link
Contributor Author

ah okay perfect - @blimpich can you give it the final run down? Thanks!

Copy link
Contributor

@blimpich blimpich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@blimpich blimpich merged commit deeab96 into main Dec 10, 2024
17 checks passed
@blimpich blimpich deleted the dangrous-stashedcopilot branch December 10, 2024 17:54
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.74-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 success ✅
🍎🔄 iOS HybridApp 🍎🔄 success ✅

Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.74-8 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 failure ❌
🍎🔄 iOS HybridApp 🍎🔄 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants