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

Desktop - Login - Unable to enter the 2FA code or exit the screen #38142

Merged
merged 5 commits into from
Mar 20, 2024

Conversation

ikevin127
Copy link
Contributor

Details

We're using desktop platform-specific desktopLoginRedirect function to pop the navigation stack to top after Session.signInWithValidateCode is called - doing this allows performing login for both 2FA and non-2FA accounts on desktop app, where there's no multi-tab functionality (like on web), coming from the web prompt (Open with New Expensify).

Fixed Issues

$ #34177
PROPOSAL: #34177 (comment)

Important

This PR's changes only affect the Desktop app, all other platforms are not affected.

This being said, the Test steps don't apply for all other platforms and Screenshots/Videos only demonstrate the current 2FA flow for all other platforms.

Tests

Prerequisite: User must be logged into web app as User A.

  1. Launch the Desktop app.
  2. Enter an email for an existing account with 2FA (User B).
  3. Go to the email inbox and locate the magic code link.
  4. Copy the Magic link and add staging. as a prefix, eg. email magic link: https://new.expensify.com/v/15879736/903350 will become https://staging.new.expensify.com/v/15879736/903350
  5. On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
  6. Confirm that the user is prompted to open the desktop app.
  7. Click on the "Open app" option.
  8. On the desktop app user should be redirected from the magic link step (autocompleted) to the 2FA code validation.

Note

In case the above steps don't work for you, try the steps mentioned in #34177 (comment) as these will work 100% of the time.

  • Verify that no errors appear in the JS console

Offline tests

TLDR: same as Tests.

Prerequisite: User must be logged into web app as User A.

  1. Launch the Desktop app.
  2. Enter an email for an existing account with 2FA (User B).
  3. Go to the email inbox and locate the magic code link.
  4. Copy the Magic link and add staging. as a prefix, eg. email magic link: https://new.expensify.com/v/15879736/903350 will become https://staging.new.expensify.com/v/15879736/903350
  5. On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
  6. Confirm that the user is prompted to open the desktop app.
  7. Click on the "Open app" option.
  8. On the desktop app user should be redirected from the magic link step (autocompleted) to the 2FA code validation.

Note

In case the above steps don't work for you, try the steps mentioned in #34177 (comment) as these will work 100% of the time.

QA Steps

TLDR: same as Tests.

Prerequisite: User must be logged into web app as User A.

  1. Launch the Desktop app.
  2. Enter an email for an existing account with 2FA (User B).
  3. Go to the email inbox and locate the magic code link.
  4. Copy the Magic link and add staging. as a prefix, eg. email magic link: https://new.expensify.com/v/15879736/903350 will become https://staging.new.expensify.com/v/15879736/903350
  5. On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
  6. Confirm that the user is prompted to open the desktop app.
  7. Click on the "Open app" option.
  8. On the desktop app user should be redirected from the magic link step (autocompleted) to the 2FA code validation.

Note

In case the above steps don't work for you, try the steps mentioned in #34177 (comment) as these will work 100% of the time.

  • 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 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.mov
Android: mWeb Chrome
android-mweb.mov
iOS: Native
ios.mov
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mov

@ikevin127 ikevin127 requested a review from a team as a code owner March 12, 2024 15:03
@melvin-bot melvin-bot bot requested review from situchan and removed request for a team March 12, 2024 15:03
Copy link

melvin-bot bot commented Mar 12, 2024

@situchan 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]

@situchan
Copy link
Contributor

@ikevin127 please fix conflict

@situchan
Copy link
Contributor

I think it's prerequisite to login any account on web. Otherwise, open desktop app prompt never appears.

@ikevin127
Copy link
Contributor Author

@ikevin127 please fix conflict

When solving the conflict I ended up removing my Navigation.popToTop() implementation and used @WojtekBoman's Navigation.resetToHome() (mentioned in #34177 (comment)) as it's more robust and it accomplishes the same thing for our issue (double-checked).

@situchan

@mountiny
Copy link
Contributor

@situchan can you please prioritize this 🙇 thank you

@situchan
Copy link
Contributor

situchan commented Mar 20, 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 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
    • 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.js 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.
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop
  • 2fa
2fa.mov
  • no 2fa
no.2fa.mov

@situchan
Copy link
Contributor

@ikevin127 please merge main

@ikevin127
Copy link
Contributor Author

@situchan Merged main.

@situchan
Copy link
Contributor

I am not able to get open desktop app prompt even when logged in status. (seems like recent regression)

I had to disable this line along with CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV ||

autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED ||

@ikevin127 what about you?

Copy link
Contributor

@situchan situchan left a comment

Choose a reason for hiding this comment

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

works well on both 2fa and no 2fa cases

@melvin-bot melvin-bot bot requested a review from mountiny March 20, 2024 10:51
@ikevin127
Copy link
Contributor Author

@situchan I tested the implementation after the merge with main and it still works as expected for me, following the steps mentioned in #34177 (comment).

@situchan
Copy link
Contributor

situchan commented Mar 20, 2024

@situchan I tested the implementation after the merge with main and it still works as expected for me, following the steps mentioned in #34177 (comment).

yes, works well on staging link but not dev link

To test open desktop app redirect on dev, this is the only line we should disable:

CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV ||

@mountiny
Copy link
Contributor

@ikevin127 @situchan to confirm, everything works well?

@ikevin127
Copy link
Contributor Author

ikevin127 commented Mar 20, 2024

@mountiny Everything works as expected on my side!

situchan also said:

works well on both 2fa and no 2fa cases

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thanks

@mountiny mountiny merged commit 8f73790 into Expensify:main Mar 20, 2024
16 checks passed
Copy link

melvin-bot bot commented Mar 20, 2024

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@melvin-bot melvin-bot bot added the Emergency label Mar 20, 2024
@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.

@mountiny
Copy link
Contributor

Tests were passing, gaslighter

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.56-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 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