Fix can't enable 2FA after login with active Xero connection
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
$ https://github.com/Expensify/App/issues/48208 PROPOSAL: https://github.com/Expensify/App/issues/48208#issuecomment-2388154070
Tests
Same as QA Steps
- [x] Verify that no errors appear in the JS console
Offline tests
Same as QA Steps
QA Steps
- Connect Xero to a WS
- Navigate to account settings and disable 2FA
- Log out of the account and log back in
- Verify a prompt to enable 2FA is shown
- Click on Enable two-factor authentication
- Verify you can complete the 2FA setup flow
- [x] Verify that no errors appear in the JS console
PR Author Checklist
- [x] I linked the correct issue in the
### Fixed Issuessection above - [x] I wrote clear testing steps that cover the changes made in this PR
- [x] I added steps for local testing in the
Testssection - [x] I added steps for the expected offline behavior in the
Offline stepssection - [x] I added steps for Staging and/or Production testing in the
QA stepssection - [x] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- [x] 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)
- [x] 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).
- [x] I added steps for local testing in the
- [x] I included screenshots or videos for tests on all platforms
- [x] I ran the tests on all platforms & verified they passed on:
- [x] Android: Native
- [x] Android: mWeb Chrome
- [x] iOS: Native
- [x] iOS: mWeb Safari
- [x] MacOS: Chrome / Safari
- [x] MacOS: Desktop
- [x] 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)
- [x] I followed proper code patterns (see Reviewing the code)
- [x] 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.
toggleReportand notonIconClick) - [x] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - [x] I verified that comments were added to code that is not self explanatory
- [x] 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.
- [x] I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method- [x] 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:
- [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- [x] 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)
- [x] 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.
- [x] I verified the JSDocs style guidelines (in
STYLE.md) were followed
- [x] 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.
- [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [x] I followed the guidelines as stated in the Review Guidelines
- [x] 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 usingAvatarare working as expected) - [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- [x] 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
- [x] I verified that if a function's arguments changed that all usages have also been updated correctly
- [x] If any new file was added I verified that:
- [x] 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
- [x] If a new CSS style is added I verified that:
- [x] A similar style doesn't already exist
- [x] The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
- [x] 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.
- [x] 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
Avataris modified, I verified thatAvataris working as expected in all cases) - [x] 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.
- [x] 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.
- [x] 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:
- [x] I verified that all the inputs inside a form are aligned with each other.
- [x] I added
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- [x] If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - [x] If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.
Screenshots/Videos
Android: Native
Android: mWeb Chrome
https://github.com/user-attachments/assets/2328dbf0-42dd-433d-b3e6-768c489e754f
iOS: Native
https://github.com/user-attachments/assets/13da9bd8-5f24-48d7-ae4f-bfa397cfd675
iOS: mWeb Safari
MacOS: Chrome / Safari
https://github.com/user-attachments/assets/c03c898d-c745-4003-9844-a048f85c1b45
MacOS: Desktop
https://github.com/user-attachments/assets/2d802fb6-a465-4cf4-9e4b-eba585820269
@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]
I got max attempt, android and iOS mWeb recording left.
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.
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
https://github.com/user-attachments/assets/86f4e403-379a-4d9d-9165-4cdf32681fc9
@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?
We already have an issue for that here: https://github.com/Expensify/App/issues/45572.
I faced the same problem, do you know the RCA?
Nope, but possibly it's conflicting with the Onyx clears here, not sure.
https://github.com/Expensify/App/blob/99f280b0edae75ff59614a1c5e98c47b39800aa5/src/libs/actions/Session/index.ts#L1030-L1034
@bernhardoj any updates?
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.
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).
https://github.com/Expensify/App/blob/3777223374152bb83333674e06b3497aaea27b81/src/libs/actions/OnyxUpdates.ts#L108-L109
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
@Beamanator
I think BE should return a bigger ID for OpenApp
Can you take a look at the BE logic? Thanks
@Beamanator Any updates?
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
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
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
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
@Beamanator Any updates on this?
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.
@Beamanator I just did it.
Email used: [email protected]
EDIT: oh, this is the 2nd OpenApp, not the first one. The 1st one isn't recorded.
Thanks @bernhardoj ! Interesting results, I will post in the issue!
@dukenv0307 I believe we can continue with the PR based on this slack comment.
@bernhardoj Will check it soon
Reviewer Checklist
- [x] I have verified the author checklist is complete (all boxes are checked off).
- [x] I verified the correct issue is linked in the
### Fixed Issuessection above - [x] I verified testing steps are clear and they cover the changes made in this PR
- [x] I verified the steps for local testing are in the
Testssection - [x] I verified the steps for Staging and/or Production testing are in the
QA stepssection - [x] 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)
- [x] 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)
- [x] I verified the steps for local testing are in the
- [x] I checked that screenshots or videos are included for tests on all platforms
- [x] I included screenshots or videos for tests on all platforms
- [x] I verified tests pass on all platforms & I tested again on:
- [x] Android: Native
- [x] Android: mWeb Chrome
- [x] iOS: Native
- [x] iOS: mWeb Safari
- [x] MacOS: Chrome / Safari
- [x] MacOS: Desktop
- [x] 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
- [x] I verified proper code patterns were followed (see Reviewing the code)
- [x] 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.
toggleReportand notonIconClick). - [x] I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - [x] I verified that comments were added to code that is not self explanatory
- [x] 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.
- [x] I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method - [x] I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- [x] 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)
- [x] 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.
- [x] I verified the JSDocs style guidelines (in
STYLE.md) were followed
- [x] 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.
- [x] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [x] I verified that this PR follows the guidelines as stated in the Review Guidelines
- [x] 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 usingAvatarhave been tested & I retested again) - [x] I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- [x] 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
- [x] If a new component is created I verified that:
- [x] A similar component doesn't exist in the codebase
- [x] All props are defined accurately and each prop has a
/** comment above it */ - [x] The file is named correctly
- [x] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- [x] The only data being stored in the state is data necessary for rendering and nothing else
- [x] For Class Components, any internal methods passed to components event handlers are bound to
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - [x] Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - [x] All JSX used for rendering exists in the render method
- [x] 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
- [x] If any new file was added I verified that:
- [x] 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
- [x] If a new CSS style is added I verified that:
- [x] A similar style doesn't already exist
- [x] The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
- [x] 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.
- [x] 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
Avataris modified, I verified thatAvataris working as expected in all cases) - [x] 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.
- [x] 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.
- [x] 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:
- [x] I verified that all the inputs inside a form are aligned with each other.
- [x] I added
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- [x] If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - [x] If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - [x] I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
Screenshots/Videos
Android: Native
https://github.com/user-attachments/assets/b99b03df-5ae1-4d1a-b2a6-c742d3cf87aa
Android: mWeb Chrome
https://github.com/user-attachments/assets/5e9003cf-e190-4cf7-a2d3-7203f7fcd158
iOS: Native
https://github.com/user-attachments/assets/c28054d4-96ef-4fe5-85a8-af6ec4f68031
iOS: mWeb Safari
https://github.com/user-attachments/assets/e32de79d-6039-40f4-a37c-a9356cb12f04
MacOS: Chrome / Safari
https://github.com/user-attachments/assets/2c208924-8b5e-4b48-952d-ce073827d689
MacOS: Desktop
https://github.com/user-attachments/assets/5327f8b9-72e7-470f-be44-2e21825ee433
@bernhardoj Can you please update the test steps and videos/screenshots then I can approve. Thanks
Updated.
:hand: This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.
🚀 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 ✅ |
This PR is failing because of issue #58217
🚀 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 ❌ |