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

Signin rhp #24083

Merged
merged 16 commits into from
Aug 19, 2023
Merged

Signin rhp #24083

merged 16 commits into from
Aug 19, 2023

Conversation

daordonez11
Copy link
Contributor

@daordonez11 daordonez11 commented Aug 3, 2023

Details

Implementation to send sign in to RHP

Fixed Issues

$ #20558
PROPOSAL: #20558 (comment)

Tests

  1. Open a public room as unauthenticated user (i.e. https://staging.new.expensify.com/r/8813851443373010)

  2. Click on sign-in

  3. Click on the back button, should see the public room instead of closing the app

  4. Enter sign-in in RHP
    //Validate claim

  5. Enter a new email and enters the validation code

  6. Verify the app loads with the authenticated data

  7. Open in an incognito mode, sign in with another account and post something in the public room

  8. Verify the message appears in the public room for the first user that claimed the anonymous account

  9. Repeat the process again from step 4 to 8, but in step 5 enter the email of an existing account

Offline tests

N/A anonymous users only work online

QA Steps

Same as test steps

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.Recording.2023-08-04.at.8.55.39.AM.mov
Web.Refresh.Testing.-.8_9_2023.8_33_09.PM.webm
Mobile Web - Chrome
mWeb.Chrome.Recording.2023-08-04.at.8.57.39.AM.mov
mWeb.Refresh.-.8_9_2023.8_38_46.PM.webm
Mobile Web - Safari
mWeb.Safari.2023-08-04.at.9.02.36.AM.mov
Desktop

N/A Public rooms are not supported in desktop

iOS
iOS.login.2023-08-07.at.1.04.18.AM.mov
Android
Android.login.2023-08-07.at.12.59.11.AM.mov

@daordonez11 daordonez11 marked this pull request as ready for review August 7, 2023 06:15
@daordonez11 daordonez11 requested a review from a team as a code owner August 7, 2023 06:15
@melvin-bot melvin-bot bot requested review from mollfpr and removed request for a team August 7, 2023 06:15
@melvin-bot
Copy link

melvin-bot bot commented Aug 7, 2023

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

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

Screen.Recording.2023-08-07.at.23.16.25.mov

@daordonez11 Could you confirm if this issue already notice before and will be fixed later?

src/pages/signin/SignInPage.js Outdated Show resolved Hide resolved
src/ROUTES.js Outdated Show resolved Hide resolved
src/pages/signin/SignInModal.js Outdated Show resolved Hide resolved
@marcochavezf
Copy link
Contributor

@daordonez11 @mollfpr for the test steps, also add the case to verify that the logged in user can send a message and other users receive it without refreshing the browser (you can use the same steps from here).

@daordonez11
Copy link
Contributor Author

For sure steps updated, will record again after fixing changes required by @mollfpr

@daordonez11
Copy link
Contributor Author

Screen.Recording.2023-08-07.at.23.16.25.mov
@daordonez11 Could you confirm if this issue already notice before and will be fixed later?

@marcochavezf what do you think of that issue, I have 2 ideas.

  1. Send to home if user is already logged in (dismissModal)
  2. Use something like authenticated views so Hmmmmm not found is shown.

I think 1 is easier but users would still see for a fraction the view. Which one do you think we should use?

Thanks for the report @mollfpr I did see it once I think it can also be reproduced by pressing back button.

@marcochavezf
Copy link
Contributor

Screen.Recording.2023-08-07.at.23.16.25.mov
@daordonez11 Could you confirm if this issue already notice before and will be fixed later?

@marcochavezf what do you think of that issue, I have 2 ideas.

  1. Send to home if user is already logged in (dismissModal)
  2. Use something like authenticated views so Hmmmmm not found is shown.

I think 1 is easier but users would still see for a fraction the view. Which one do you think we should use?

Thanks for the report @mollfpr I did see it once I think it can also be reproduced by pressing back button.

My first question is, why the validation code is set after refreshing the page? I think it's fine to show the sign-in modal when the user enters the URL, but it's weird that the form is displaying the validation code and trying to submit it

@daordonez11
Copy link
Contributor Author

So basically this occurs because the state of the component is mantained, since this was originally an unprotected view the user does not see it but its just the "final" state of the page. We could use something like clearLocalSignInData before leaving the page but tbh I don't think showing the signin should be enabled when you are already logged in. Me recommendation would be to auto dismiss the modal if the view is accessed via url and the user is already logged in.

cc @mollfpr @marcochavezf

@mollfpr
Copy link
Contributor

mollfpr commented Aug 9, 2023

Me recommendation would be to auto dismiss the modal if the view is accessed via url and the user is already logged in.

@daordonez11 @marcochavezf I agree with this.

@marcochavezf
Copy link
Contributor

Me recommendation would be to auto dismiss the modal if the view is accessed via url and the user is already logged in.

@daordonez11 @marcochavezf I agree with this.

Sounds good, let's go with that solution!

@daordonez11
Copy link
Contributor Author

Ok, guys issue is now solved with the last commit. Will now execute the tests requested by @marcochavezf and include videos with the new scenario 🫡

cc @mollfpr

@daordonez11
Copy link
Contributor Author

Ok guys had to implement a last detail in order for notifications and new scenarios to work. Final commit includes that implementation. Currently uploading videso with new implementation. So ready again for review with new scenario @mollfpr!

cc @marcochavezf

@mollfpr
Copy link
Contributor

mollfpr commented Aug 12, 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 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 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
New_Recording_-_8_18_2023._10_26_18_PM.mp4
Mobile Web - Chrome
Screen_Recording_20230818_224922_Chrome.mp4
Mobile Web - Safari
Simulator.Screen.Recording.-.iPhone.14.Pro.-.2023-08-18.at.22.46.52.mp4
Desktop
Screen.Recording.2023-08-18.at.22.41.27.mov
iOS
Simulator.Screen.Recording.-.iPhone.14.Pro.-.2023-08-18.at.22.43.46.mp4
Android
Screen_Recording_20230818_235329_New.Expensify.Dev.mp4

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

Sorry for the delay, I am just feeling better now 🙏

The code mostly looks good, just couples of NABs.

There's a strange bug that showing the SignInModal page after sign in.

Steps:

  1. Open a public room with anonymous account
  2. Clear the browser storage
  3. Open the sign-in page and complete the sign-in flow
  4. The user will be redirected to the sign-in-modal with the validate code filled.

I believe this is an edge-case, but I'm afraid we will have similar issue with no step reproduce it yet.

Screen.Recording.2023-08-13.at.14.27.48.mp4

src/pages/signin/SignInModal.js Outdated Show resolved Hide resolved
src/pages/signin/SignInPage.js Show resolved Hide resolved
src/pages/signin/SignInPageLayout/index.js Show resolved Hide resolved
@daordonez11
Copy link
Contributor Author

Hey @mollfpr thanks for the update and hope you get better! I'll check the NAB's and the error tomorrow, I definitely need to make sure rhp is not shown if you are already logged in, probably with more than one check. I'll let you guys know when it's ready.

cc @marcochavezf

@daordonez11
Copy link
Contributor Author

Thanks for the report @mollfpr the issue was happening because navigation was not ready at that point so dismissModal did nothing. Just uploaded a commit with the NABs and the fix with the navigation promise. The easy way of replicating was just opening a new tab with the sign in modal url 😂.

cc @marcochavezf

@daordonez11
Copy link
Contributor Author

PS: Solved conflict that appeared today!
cc @marcochavezf @mollfpr

@mollfpr
Copy link
Contributor

mollfpr commented Aug 18, 2023

Thanks, @daordonez11. Seems looks good now. I'll be finishing the records in an hour.

Copy link
Contributor

@mollfpr mollfpr left a comment

Choose a reason for hiding this comment

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

LGTM and tests well 🚀

Copy link
Contributor

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

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

Looks great, thank you guys, you're awesome!

@marcochavezf marcochavezf merged commit 2004924 into Expensify:main Aug 19, 2023
13 checks passed
@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/marcochavezf in version: 1.3.56-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.56-24 🚀

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

@@ -35,6 +35,9 @@ const propTypes = {
/** Whether to show welcome header on a particular page */
shouldShowWelcomeHeader: PropTypes.bool.isRequired,

/** Whether or not the sign in page is being rendered in the RHP modal */
isInModal: PropTypes.bool.isRequired,
Copy link
Contributor

Choose a reason for hiding this comment

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

When making this required, we forgot to update the props for this component in src/pages/signin/ThirdPartySignInPage.js (https://github.com/Expensify/App/pull/23673/files#diff-7d96f9ceabb4069bb79fe99d6e1f2610c32b4190911f32f455e3cc16449c299bR59). This later caused #28255

@roryabraham
Copy link
Contributor

Hi 👋🏼

The SignInPageLayout was dependent upon isSmallScreenWidth for it's layout to look correct. However, this displayed the SignInPageLayout in the RHP. The intention was for it to look and behave how it would in a small screen, but the isSmallScreenWidth was still true on wide screens.

We addressed this bug in #28025

@shubham1206agra
Copy link
Contributor

Hello

You have forgot to take out extra padding for RHP, which caused #31445.

@@ -48,6 +48,11 @@ Onyx.connect({
}

currentAccountID = val.accountID;
if (Navigation.isActiveRoute(ROUTES.SIGN_IN_MODAL)) {
// This means sign in in RHP was successful, so we can dismiss the modal and subscribe to user events
Navigation.dismissModal();
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems we are closing the modal early which causes the issue #36976

if (Navigation.isActiveRoute(ROUTES.SIGN_IN_MODAL)) {
// This means sign in in RHP was successful, so we can dismiss the modal and subscribe to user events
Navigation.dismissModal();
User.subscribeToUserEvents();
Copy link
Contributor

Choose a reason for hiding this comment

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

Came from this issue
To solve this error, we needed to make sure that Pusher instance initialization (Pusher.init()) is complete before any subscription calls are made.

Like here

Pusher.init({
appKey: CONFIG.PUSHER.APP_KEY,
cluster: CONFIG.PUSHER.CLUSTER,
authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
}).then(() => {
User.subscribeToUserEvents();
});

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.

9 participants