Fix can't enable 2FA after login with active Xero connection by bernhardoj · Pull Request #50251 · Expensify/App

bernhardoj · 2024-10-04T15:37:40Z

Details

If the user has connected to Xero but the 2FA is disabled, logging in to the app will show the prompt to enable 2FA, but unable to do so.

Fixed Issues

$ #48208
PROPOSAL: #48208 (comment)

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

QA Steps

[User A] Connect Xero to a WS
[User A] Invite User B to WS as an admin
[User B] Sign in into the app
[User B] Verify a prompt to enable 2FA is shown
[User B] Press on Enable two-factor authentication
[User B] Verify you are not promoted to validate the account

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

android.mweb.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

ios.mweb.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2024-10-04T15:37:46Z

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

bernhardoj · 2024-10-04T15:38:17Z

I got max attempt, android and iOS mWeb recording left.

bernhardoj · 2024-10-04T15:40:32Z

After re-enabling the 2FA, we will trigger another OpenApp request that will be successful this time, however, looks like there is some bug with the Onyx where the data from OpenApp is not saved at all (I verified this by looking at the Applications tab).

The only platform that doesn't have this issue so far is the android mWeb.

dukenv0307 · 2024-10-05T05:02:04Z

Bug:

Click on Enable two-factor authentication
Refresh app
Click Enable 2FA
Click back button on 2FA page
Observe the LHN moves from right to left
Open setting page
The empty LHN is still shown

Screen.Recording.2024-10-05.at.11.57.49.mov

dukenv0307 · 2024-10-05T05:07:27Z

@bernhardoj

After re-enabling the 2FA, we will trigger another OpenApp request that will be successful this time, however, looks like there is some bug with the Onyx where the data from OpenApp is not saved at all (I verified this by looking at the Applications tab).

I faced the same problem, do you know the RCA?

bernhardoj · 2024-10-05T07:39:36Z

We already have an issue for that here: #45572.

I faced the same problem, do you know the RCA?

Nope, but possibly it's conflicting with the Onyx clears here, not sure.

App/src/libs/actions/Session/index.ts

Lines 1030 to 1034 in 99f280b

    
           if (shouldClearData) { 
        
               const keysToPreserveWithPrivatePersonalDetails = [...KEYS_TO_PRESERVE, ONYXKEYS.PRIVATE_PERSONAL_DETAILS]; 
        
               Onyx.clear(keysToPreserveWithPrivatePersonalDetails).then(() => updateAuthTokenAndOpenApp(response.authToken, response.encryptedAuthToken)); 
        
               return; 
        
           }

dukenv0307 · 2024-10-08T15:37:14Z

@bernhardoj any updates?

bernhardoj · 2024-10-09T11:36:38Z

Nope, but possibly it's conflicting with the Onyx clears here, not sure.

The only update is, I tried remove the Onyx.clears but the problem still happen. I log every Onyx operation and looks like the Onyx data from OpenApp is never processed at all.

bernhardoj · 2024-10-09T12:03:36Z

So, the issue is that the app detected that the update from OpenApp is older or the same as the current state by comparing the lastUpdateID (from API response) with lastUpdateIDAppliedToClient (previous applied lastUpdateID).

App/src/libs/actions/OnyxUpdates.ts

Lines 108 to 109 in 3777223

    
           if (lastUpdateID && lastUpdateIDAppliedToClient && Number(lastUpdateID) <= lastUpdateIDAppliedToClient) { 
        
               Log.info('[OnyxUpdateManager] Update received was older than or the same as current state, returning without applying the updates other than successData and failureData');

In our case, it's the same.

Here is the lastUpdateID of 2FA validation request: 2323138624

Here is the lastUpdateID of OpenApp request: 2323138624

I think BE should return a bigger ID for OpenApp

dukenv0307 · 2024-10-13T15:12:12Z

@Beamanator

I think BE should return a bigger ID for OpenApp

Can you take a look at the BE logic? Thanks

dukenv0307 · 2024-10-16T02:55:22Z

@Beamanator Any updates?

Beamanator · 2024-10-16T07:33:14Z

Yo thanks for the ping, I was OOO last 4 days - will try to get to this today, if not I'll def get to this tomorrow

Beamanator · 2024-10-18T16:02:13Z

Hmm in my head i was thinking that "the same lastUpdateID would mean there's "no new Onyx updates we pulled" - but that doesn't necessarily mean the API response's onyx data is the same, right? Just that the first API call - to TwoFactorAuth_Vali* didn't queue new onyx data? Maybe?

I'm asking internally if this is expected for not

bernhardoj · 2024-10-18T18:00:20Z

the same lastUpdateID would mean there's "no new Onyx updates we pulled"

Hmm, maybe it happens because we already call the first OpenApp when login, but it fails as I mentioned here

OpenApp - failed
TwoFactorAuth_Validate - success
OpenApp - ignored

Beamanator · 2024-10-21T13:30:45Z

However, OpenApp throws an error if we login to an account with Xero connected without 2FA enabled.

Hmm yeah I might have to look into that actually, maybe that will fix our problems all at once

dukenv0307 · 2024-11-02T04:16:08Z

@Beamanator Any updates on this?

Beamanator · 2024-11-04T09:26:52Z

Sorry for the delay gents, can either of you run this workflow and let me know when you do so i can investigate the logs?

However, OpenApp throws an error if we login to an account with Xero connected without 2FA enabled.

bernhardoj · 2024-11-04T12:49:41Z

@Beamanator I just did it.

Email used: bernhard.josephus+0104@gmail.com

EDIT: oh, this is the 2nd OpenApp, not the first one. The 1st one isn't recorded.

Beamanator · 2024-11-04T14:08:18Z

Thanks @bernhardoj ! Interesting results, I will post in the issue!

bernhardoj · 2025-03-07T10:58:34Z

@dukenv0307 I believe we can continue with the PR based on this slack comment.

dukenv0307 · 2025-03-07T14:15:28Z

@bernhardoj Will check it soon

dukenv0307 · 2025-03-10T04:11:57Z

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

Screen.Recording.2025-03-10.at.11.09.30.mov

Android: mWeb Chrome

Screen.Recording.2025-03-10.at.11.05.54.mov

iOS: Native

Screen.Recording.2025-03-10.at.11.08.38.mov

iOS: mWeb Safari

Screen.Recording.2025-03-10.at.10.58.15.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-10.at.10.54.25.mov

MacOS: Desktop

Screen.Recording.2025-03-10.at.11.11.39.mov

dukenv0307 · 2025-03-10T04:12:23Z

@bernhardoj Can you please update the test steps and videos/screenshots then I can approve. Thanks

bernhardoj · 2025-03-10T07:00:27Z

Updated.

Beamanator

LGTM 🙏 👍

OSBotify · 2025-03-10T19:56:26Z

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

github-actions · 2025-03-10T21:35:04Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.11-1 🚀

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

IuliiaHerets · 2025-03-11T14:18:07Z

This PR is failing because of issue #58217

github-actions · 2025-03-14T01:05:47Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.12-7 🚀

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

fix can't enable 2fa

8d7c920

bernhardoj requested a review from a team as a code owner October 4, 2024 15:37

melvin-bot bot requested review from dukenv0307 and removed request for a team October 4, 2024 15:37

prettier

ebf6e51

NJ-2020 mentioned this pull request Oct 29, 2024

[$250] Xero - Verify account via Magic Code for 2FA doesn’t work in NewDot #50273

Closed

6 tasks

Merge branch 'main' into fix/48208-can't-reenable-2fa

1c506c0

bernhardoj added 2 commits February 21, 2025 14:26

Merge branch 'main' into fix/48208-can't-reenable-2fa

87bc2b9

lint

3017e3c

dukenv0307 approved these changes Mar 10, 2025

View reviewed changes

melvin-bot bot requested a review from Beamanator March 10, 2025 07:20

VickyStash mentioned this pull request Mar 10, 2025

[HOLD #57689][$250][HIGH] Full story: Loading Issues with Concierge Not Addressing Copilot #57710

Closed

8 tasks

dukenv0307 mentioned this pull request Mar 10, 2025

Show a fullscreen 2fa required instead of modal #58071

Merged

50 tasks

Beamanator approved these changes Mar 10, 2025

View reviewed changes

Beamanator merged commit 3412f90 into Expensify:main Mar 10, 2025
18 checks passed

github-actions bot mentioned this pull request Mar 10, 2025

Deploy Checklist: New Expensify 2025-03-10 #58124

Closed

IuliiaHerets mentioned this pull request Mar 11, 2025

[$250] 2FA - User prompted to add 2FA when removing it after user is removed from Xero WS #58217

Closed

8 tasks

IuliiaHerets mentioned this pull request Mar 11, 2025

[Due for payment 2025-04-14] Android - 2FA - After enabling 2FA Inbox becomes empty #58232

Closed

8 tasks

vincdargento mentioned this pull request Mar 11, 2025

[Hold for #59154] [$250] iOS Hybrid - 2FA - Enable two-factor authentication modal is not shown for the admin member #58247

Closed

8 tasks

trjExpensify mentioned this pull request Mar 11, 2025

[Due for payment 2025-03-21] [$250][HIGH] Xero – Can’t enable 2FA after relogin if Xero connection is active #48208

Closed

6 tasks

bernhardoj mentioned this pull request Mar 20, 2025

[Due for payment 2025-03-27] [$250] 2FA - Hybrid - User asked to again validate account after disabling 2FA #58682

Closed

8 tasks

Conversation

bernhardoj commented Oct 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Oct 4, 2024

Uh oh!

bernhardoj commented Oct 4, 2024

Uh oh!

bernhardoj commented Oct 4, 2024

Uh oh!

dukenv0307 commented Oct 5, 2024

Uh oh!

dukenv0307 commented Oct 5, 2024

Uh oh!

bernhardoj commented Oct 5, 2024

Uh oh!

dukenv0307 commented Oct 8, 2024

Uh oh!

bernhardoj commented Oct 9, 2024

Uh oh!

bernhardoj commented Oct 9, 2024

Uh oh!

dukenv0307 commented Oct 13, 2024

Uh oh!

dukenv0307 commented Oct 16, 2024

Uh oh!

Beamanator commented Oct 16, 2024

Uh oh!

Beamanator commented Oct 18, 2024

Uh oh!

bernhardoj commented Oct 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Beamanator commented Oct 21, 2024

Uh oh!

dukenv0307 commented Nov 2, 2024

Uh oh!

Beamanator commented Nov 4, 2024

Uh oh!

bernhardoj commented Nov 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Beamanator commented Nov 4, 2024

Uh oh!

bernhardoj commented Mar 7, 2025

Uh oh!

dukenv0307 commented Mar 7, 2025

Uh oh!

dukenv0307 commented Mar 10, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 commented Mar 10, 2025

Uh oh!

bernhardoj commented Mar 10, 2025

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 10, 2025

Uh oh!

github-actions bot commented Mar 10, 2025

Uh oh!

IuliiaHerets commented Mar 11, 2025

Uh oh!

github-actions bot commented Mar 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

bernhardoj commented Oct 4, 2024 •

edited

Loading

bernhardoj commented Oct 18, 2024 •

edited

Loading

bernhardoj commented Nov 4, 2024 •

edited

Loading