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

feat: add 2-factor authentication #18576

Merged
merged 34 commits into from
May 17, 2023
Merged

Conversation

thiagobrez
Copy link
Contributor

@thiagobrez thiagobrez commented May 8, 2023

Details

Implementation of the 2-factor authentication flow, according to the design doc.

Fixed Issues

$ #18080
PROPOSAL: GH_LINK_ISSUE(COMMENT)

Tests

  • Verify that no errors appear in the JS console
  • Go to profile
  • Go to Security tab
  • Go to Two-factor authentication tab

Enabling 2-FA flow:

Step 1: Recovery Codes

  • A list of recovery codes should appear. Next button should only be enabled if one of "Copy" or "Download" buttons was pressed before
  • Pressing "Copy" should copy the recovery codes to the clipboard
  • Pressing "Download" should download the file locally to the device. On iOS it should open the "Share" menu, enabling the user to save anywhere wanted. On Android, it should download directly to the Downloads folder

Step 2: Verify

  • A blue link in the top of the page should redirect to the expensify FAQ regarding setting up an authenticator app
  • A QRCode should appear and should be able to scan using an authenticator app. Once you scan, it should show in the authenticator app the "Expensify" name and the user primary login (usually email)
  • In case the user can't use the QRCode to set up the authenticator app, should be able to press the "Copy" button to input the secret manually in the authenticator app
  • Once the authenticator app is setup, user should be able to enter the generated code in the input at the bottom of the page. Entering the correct code should automatically move the user to the success page. Entering an incorrect code should show an error below the input

Step 3: Finished

  • A fireworks animation should appear. Pressing the next button should finish the flow and take the user to the main two-factor authentication page, where it will say that 2-fa is enabled

Disabling 2-FA flow:

  • Pressing the disable button should open a modal
  • Confirming the modal should take the user to the success page, indicating that 2-FA was disabled
  • Pressing "Got it" should take the user back to the Security settings page

Offline tests

  • All pages implement Offline Pattern D, so they should be blocked when offline

QA Steps

  • Verify that no errors appear in the JS console
  • Go to profile
  • Go to Security tab
  • Go to Two-factor authentication tab

Enabling 2-FA flow:

Step 1: Recovery Codes

  • A list of recovery codes should appear. Next button should only be enabled if one of "Copy" or "Download" buttons was pressed before
  • Pressing "Copy" should copy the recovery codes to the clipboard
  • Pressing "Download" should download the file locally to the device. On iOS it should open the "Share" menu, enabling the user to save anywhere wanted. On Android, it should download directly to the Downloads folder

Step 2: Verify

  • A blue link in the top of the page should redirect to the expensify FAQ regarding setting up an authenticator app
  • A QRCode should appear and should be able to scan using an authenticator app. Once you scan, it should show in the authenticator app the "Expensify" name and the user primary login (usually email)
  • In case the user can't use the QRCode to set up the authenticator app, should be able to press the "Copy" button to input the secret manually in the authenticator app
  • Once the authenticator app is setup, user should be able to enter the generated code in the input at the bottom of the page. Entering the correct code should automatically move the user to the success page. Entering an incorrect code should show an error below the input

Step 3: Finished

  • A fireworks animation should appear. Pressing the next button should finish the flow and take the user to the main two-factor authentication page, where it will say that 2-fa is enabled

Disabling 2-FA flow:

  • Pressing the disable button should open a modal
  • Confirming the modal should take the user to the success page, indicating that 2-FA was disabled
  • Pressing "Got it" should take the user back to the Security settings page

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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
web.mov
safari.mov
Mobile Web - Chrome
android.web.mov
Mobile Web - Safari
ios.web.mp4
Desktop
desktop.mov
iOS
ios.mp4
Android
android.mov

@thiagobrez
Copy link
Contributor Author

Important notes / open questions:

  1. Design doc did not contain specific directions to downloading the codes on native (only web), so I decided to use the Share API on iOS, and saving to the Downloads folder on Android. See TextFileLink.ios.js and TextFileLink.android.js

  2. Design doc did not contain desired spanish translations, so I did it manually and these should probably be reviewed with caution!

  3. QRCode looks quite different from design using the proposed level of correction Q. Maybe we want to try different levels?

@MonilBhavsar
Copy link
Contributor

Important notes / open questions:

  1. Design doc did not contain specific directions to downloading the codes on native (only web), so I decided to use the Share API on iOS, and saving to the Downloads folder on Android. See TextFileLink.ios.js and TextFileLink.android.js

Yes, we missed it. That sounds good 👍

  1. Design doc did not contain desired spanish translations, so I did it manually and these should probably be reviewed with caution!

I can get that for you!

  1. QRCode looks quite different from design using the proposed level of correction Q. Maybe we want to try different levels?

I tried using different levels while writing the doc, but looks like 'Q' is closest to the proposed one. Do you think any other level is closest to the proposed one? If so, we can use that. 😄

@thiagobrez
Copy link
Contributor Author

Awesome, thanks @MonilBhavsar !

Here is a quick comparison between all QRCode levels:

L Screenshot 2023-05-08 at 14 34 00
M Screenshot 2023-05-08 at 14 35 02
Q Screenshot 2023-05-08 at 14 35 29
H Screenshot 2023-05-08 at 14 35 47

Personally, I find the L level the closest to design, but not sure if being too low on detail can cause technical issues while scanning

@MonilBhavsar
Copy link
Contributor

L looks good to me 👍
Not sure why Q seemed to be close to me at that time.
Also, we'll be refactoring this QR code design to meet our proposed design after this PR is merged

src/ROUTES.js Outdated Show resolved Hide resolved
src/ROUTES.js Outdated Show resolved Hide resolved
src/components/TextFileLink/index.android.js Outdated Show resolved Hide resolved
src/components/TextFileLink/index.android.js Outdated Show resolved Hide resolved
src/components/TextFileLink/index.android.js Outdated Show resolved Hide resolved
src/pages/settings/Security/TwoFactorAuth/VerifyPage.js Outdated Show resolved Hide resolved
src/pages/settings/Security/TwoFactorAuth/VerifyPage.js Outdated Show resolved Hide resolved
src/pages/settings/Security/TwoFactorAuth/VerifyPage.js Outdated Show resolved Hide resolved
src/pages/settings/Security/TwoFactorAuth/SuccessPage.js Outdated Show resolved Hide resolved
src/pages/settings/Security/TwoFactorAuth/CodesPage.js Outdated Show resolved Hide resolved
@thiagobrez
Copy link
Contributor Author

@MonilBhavsar All new comments resolved, good catches! 👍🏻

Regarding clearing the Onyx data, since that page is now a functional component (following the effort to migrate away from Class Components) I disabled the arrow-body-style eslint rule (and left a comment) for that unmount effect because I thought it made the code block unreadable:

Before After
Screenshot 2023-05-16 at 16 36 37 Screenshot 2023-05-16 at 16 36 17

And here's the shield icon result:

Screenshot 2023-05-16 at 16 32 31

@MonilBhavsar
Copy link
Contributor

MonilBhavsar commented May 17, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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(themeColors.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 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

Web
Screen.Recording.2023-05-17.at.3.28.05.PM.mov
Mobile Web - Chrome
Screen.Recording.2023-05-17.at.3.57.16.PM.mov
Mobile Web - Safari
Screen.Recording.2023-05-17.at.5.19.22.PM.mov
Desktop
Screen.Recording.2023-05-17.at.3.30.55.PM.mov
iOS Screenshot 2023-05-17 at 8 57 08 PM
Android
Screen.Recording.2023-05-17.at.4.05.27.PM.mov

Copy link
Contributor

@MonilBhavsar MonilBhavsar left a comment

Choose a reason for hiding this comment

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

Great work @thiagobrez 👏

@MonilBhavsar MonilBhavsar merged commit 3bee6f9 into Expensify:main May 17, 2023
@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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 1.3.16-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

2 similar comments
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.16-7 🚀

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

@abdulrahuman5196
Copy link
Contributor

A minor regression caused due to height styles having less value - #19571

@abdulrahuman5196
Copy link
Contributor

Just updating on another issue caused by this PR as part BZ checklist.
The components introduced in this PR was not wrapped inside of scrollView which is one of the checklist items in reviewers checklist. Causing this issue - #21057

@thiagobrez
Copy link
Contributor Author

thiagobrez commented Jun 30, 2023

Thanks for pointing out @abdulrahuman5196 . Will take more care next time 🚀

Comment on lines +2155 to +2157
twoFactorAuthCodesButton: {
minWidth: 100,
},
Copy link
Contributor

Choose a reason for hiding this comment

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

The min width here was not enough and caused the copy button's width to change on click resulting in buttons jump behaviour #21566

<Button
success
text={props.translate('common.next')}
isDisabled
Copy link
Contributor

Choose a reason for hiding this comment

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

✋ Coming from #20848

We want the button to be pressed like what we have for the sign-in page and maintain consistency between a similar flow.

* @returns {string}
*/
function buildAuthenticatorUrl() {
return `otpauth://totp/Expensify:${props.account.primaryLogin}?secret=${props.account.twoFactorAuthSecretKey}&issuer=Expensify`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Coming from #19366:
props.account.primaryLogin is not 100% value.
When user create new account, this value doesn't exist.
Instead, we replaced this with session.email which is stable value.

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.