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

ikevin127 · 2024-03-12T15:03:24Z

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.

Launch the Desktop app.
Enter an email for an existing account with 2FA (User B).
Go to the email inbox and locate the magic code link.
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
On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
Confirm that the user is prompted to open the desktop app.
Click on the "Open app" option.
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.

Launch the Desktop app.
Enter an email for an existing account with 2FA (User B).
Go to the email inbox and locate the magic code link.
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
On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
Confirm that the user is prompted to open the desktop app.
Click on the "Open app" option.
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.

Launch the Desktop app.
Enter an email for an existing account with 2FA (User B).
Go to the email inbox and locate the magic code link.
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
On the web app (prerequisite step), open a new tab and navigate to the staging magic link.
Confirm that the user is prompted to open the desktop app.
Click on the "Open app" option.
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

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

melvin-bot · 2024-03-12T15:03:29Z

@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 · 2024-03-14T06:38:13Z

@ikevin127 please fix conflict

situchan · 2024-03-14T06:45:55Z

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

ikevin127 · 2024-03-14T11:12:23Z

@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 · 2024-03-18T22:22:38Z

@situchan can you please prioritize this 🙇 thank you

situchan · 2024-03-20T05:10:49Z

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 · 2024-03-20T05:11:01Z

@ikevin127 please merge main

ikevin127 · 2024-03-20T05:23:54Z

@situchan Merged main.

situchan · 2024-03-20T10:48:58Z

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

App/src/components/DeeplinkWrapper/index.website.tsx

Line 71 in 55410f5

autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED ||

@ikevin127 what about you?

situchan

works well on both 2fa and no 2fa cases

ikevin127 · 2024-03-20T10:51:51Z

@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 · 2024-03-20T10:54:06Z

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

App/src/components/DeeplinkWrapper/index.website.tsx

Line 70 in 55410f5

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

mountiny · 2024-03-20T14:43:03Z

@ikevin127 @situchan to confirm, everything works well?

ikevin127 · 2024-03-20T15:05:20Z

@mountiny Everything works as expected on my side!

situchan also said:

works well on both 2fa and no 2fa cases

mountiny

Thanks

melvin-bot · 2024-03-20T16:41:43Z

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

OSBotify · 2024-03-20T16:47:30Z

✋ 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 · 2024-03-20T18:50:30Z

Tests were passing, gaslighter

OSBotify · 2024-03-22T16:20:33Z

🚀 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 · 2024-03-27T04:49:42Z

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

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

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

6aa7212

ikevin127 requested a review from a team as a code owner March 12, 2024 15:03

melvin-bot bot requested review from situchan and removed request for a team March 12, 2024 15:03

Merge branch 'main' of https://github.com/Expensify/App into fix/34177

ff46494

ikevin127 mentioned this pull request Mar 12, 2024

[C+ payment required, Situ out until May] [HOLD for payment 2024-04-03] [$500] Desktop - Login - Unable to enter the 2FA code or exit the opened screen on desktop #34177

Closed

6 tasks

ikevin127 added 2 commits March 14, 2024 13:10

Merge branch 'main' of https://github.com/Expensify/App into fix/34177

6fbf843

solved conflict

7d9e274

mountiny assigned ikevin127 Mar 18, 2024

Merge branch 'main' of https://github.com/Expensify/App into fix/34177

70136ac

situchan approved these changes Mar 20, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny March 20, 2024 10:51

mountiny approved these changes Mar 20, 2024

View reviewed changes

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

melvin-bot bot added the Emergency label Mar 20, 2024

mountiny removed the Emergency label Mar 20, 2024

github-actions bot mentioned this pull request Mar 22, 2024

Deploy Checklist: New Expensify 2024-03-22 #38811

Closed

ikevin127 mentioned this pull request Sep 9, 2024

[$250] Top section of Settings doesn't remain fixed like we do on other pages #48736

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

ikevin127 commented Mar 12, 2024

melvin-bot bot commented Mar 12, 2024

situchan commented Mar 14, 2024

situchan commented Mar 14, 2024

ikevin127 commented Mar 14, 2024

mountiny commented Mar 18, 2024

situchan commented Mar 20, 2024 •

edited

Loading

situchan commented Mar 20, 2024

ikevin127 commented Mar 20, 2024

situchan commented Mar 20, 2024

situchan left a comment

ikevin127 commented Mar 20, 2024

situchan commented Mar 20, 2024 •

edited

Loading

mountiny commented Mar 20, 2024

ikevin127 commented Mar 20, 2024 •

edited

Loading

mountiny left a comment

melvin-bot bot commented Mar 20, 2024

OSBotify commented Mar 20, 2024

mountiny commented Mar 20, 2024

OSBotify commented Mar 22, 2024

OSBotify commented Mar 27, 2024

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

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

Conversation

ikevin127 commented Mar 12, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 12, 2024

situchan commented Mar 14, 2024

situchan commented Mar 14, 2024

ikevin127 commented Mar 14, 2024

mountiny commented Mar 18, 2024

situchan commented Mar 20, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

situchan commented Mar 20, 2024

ikevin127 commented Mar 20, 2024

situchan commented Mar 20, 2024

situchan left a comment

Choose a reason for hiding this comment

ikevin127 commented Mar 20, 2024

situchan commented Mar 20, 2024 • edited Loading

mountiny commented Mar 20, 2024

ikevin127 commented Mar 20, 2024 • edited Loading

mountiny left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Mar 20, 2024

OSBotify commented Mar 20, 2024

mountiny commented Mar 20, 2024

OSBotify commented Mar 22, 2024

OSBotify commented Mar 27, 2024

situchan commented Mar 20, 2024 •

edited

Loading

situchan commented Mar 20, 2024 •

edited

Loading

ikevin127 commented Mar 20, 2024 •

edited

Loading