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

[HOLD Web-Expensify#43646] Fixes to delegate access reauthentication #49375

Open
wants to merge 6 commits into
base: main
Choose a base branch
from

Conversation

jasperhuangg
Copy link
Contributor

@jasperhuangg jasperhuangg commented Sep 18, 2024

Needs https://github.com/Expensify/Web-Expensify/pull/43646

Details

This PR ensures:

  • You are brought back to the delegate's original account when the delegate token expires after connecting to delegated access.
  • You can reauthenticate with the stored credentials when the normal token expires after disconnecting from delegated access.

Fixed Issues

$ #48750

Tests/QA

Need someone in ring1 around while QAing to manually expire the authTokens

  1. Create two accounts, one main account and one copilot account.
  2. Using the main account, set the copilot as the delegate via OldDot.
  3. Sign into the copilot account and copilot into the main account in NewDot
  4. Expire the delegate token by running the following CQ
REPLACE INTO nameValuePairs (accountID, name, value, created) VALUES (<copilotAccountID>, 'private_minimumAuthTokenIssueTime', strftime('%s', 'now', 'utc') || '000000', Date('now'));
  1. Try to open a report.
  2. You should automatically get switched back to the delegate's original account. The profile UI should show the delegate's original account.
  3. Expire the normal token by running the following CQ
REPLACE INTO nameValuePairs (accountID, name, value, created) VALUES (<mainAccountID>, 'private_minimumAuthTokenIssueTime', strftime('%s', 'now', 'utc') || '000000', Date('now'));
  1. Try to open a report.
  2. You should be able to successfully the open the report and you shouldn't face any permissions errors.

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 verified the translation was requested/reviewed 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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2024-09-23.at.11.32.13.AM.mov
MacOS: Desktop

@jasperhuangg jasperhuangg self-assigned this Sep 18, 2024
@jasperhuangg jasperhuangg marked this pull request as ready for review September 18, 2024 10:17
@jasperhuangg jasperhuangg requested a review from a team as a code owner September 18, 2024 10:17
@melvin-bot melvin-bot bot requested review from eVoloshchak and removed request for a team September 18, 2024 10:17
Copy link

melvin-bot bot commented Sep 18, 2024

@eVoloshchak 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

melvin-bot bot commented Sep 18, 2024

@parasharrajat @puneetlath One of you needs to 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]

@melvin-bot melvin-bot bot removed the request for review from a team September 18, 2024 10:17
@jasperhuangg jasperhuangg changed the title Ensure we don't clear the credentials when connecting/disconnecting delegates [HOLD Web-Expensify#43584] Ensure we don't clear the credentials when connecting/disconnecting delegates Sep 19, 2024
@jasperhuangg jasperhuangg added the InternalQA This pull request required internal QA label Sep 19, 2024
@jasperhuangg
Copy link
Contributor Author

jasperhuangg commented Sep 19, 2024

Marking this as InternalQA so that whoever QAs this doesn't need to wait 2 hours for an authToken to expire manually. More instructions on how to expire the authToken via CQ are provided in the QA steps.

dangrous
dangrous previously approved these changes Sep 19, 2024
Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

This seems to work for me! @jasperhuangg I reached out separately with a question about related behavior though

puneetlath
puneetlath previously approved these changes Sep 19, 2024
@jasperhuangg
Copy link
Contributor Author

@dangrous and I are discussing the other issues via DM. They could potentially affect the solution presented in this PR so I'm going to hold off on merging this for the time being.

@jasperhuangg jasperhuangg changed the title [HOLD Web-Expensify#43584] Ensure we don't clear the credentials when connecting/disconnecting delegates [HOLD Web-Expensify#43584] Ensure can can successfully reauthenticate with credentials after delegated access Sep 20, 2024
@jasperhuangg jasperhuangg changed the title [HOLD Web-Expensify#43584] Ensure can can successfully reauthenticate with credentials after delegated access [HOLD Web-Expensify#43646] Ensure can can successfully reauthenticate with credentials after delegated access Sep 23, 2024
@jasperhuangg jasperhuangg changed the title [HOLD Web-Expensify#43646] Ensure can can successfully reauthenticate with credentials after delegated access [HOLD Web-Expensify#43646] Ensure we can successfully reauthenticate with credentials after delegated access Sep 23, 2024
@jasperhuangg jasperhuangg changed the title [HOLD Web-Expensify#43646] Ensure we can successfully reauthenticate with credentials after delegated access [HOLD Web-Expensify#43646] Fixes to delegate access reauthentication Sep 23, 2024
@dangrous
Copy link
Contributor

Okay I think this is ALMOST there - I just tested, and it's working as expected except that:

When the delegate token expires and the user is returned to their original account, the LHN swaps nicely, but if you click into any of those chats they aren't loading properly, until you reload the page.

@jasperhuangg
Copy link
Contributor Author

Thanks for catching that @dangrous, I'll look into that and ping you when it's ready for another look. Seems like some session data probably isn't being updated correctly.

@jasperhuangg
Copy link
Contributor Author

@dangrous Addressed the bug. It seems we were clearing out the isSidebarLoaded key in Onyx when using delegate access. This was preventing the report screen from appearing as loaded.

It should be fine to preserve that key because we never unrender the sidebar.

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

niceeeee - this works well for me!

@jasperhuangg jasperhuangg removed the request for review from parasharrajat September 26, 2024 22:31
@jasperhuangg
Copy link
Contributor Author

Unassigned @parasharrajat since we only need one C+ here and @eVoloshchak was auto-assigned first

@jasperhuangg
Copy link
Contributor Author

This is ready for review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
InternalQA This pull request required internal QA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants