Fixes for feature: Add support for redirecting user to a target URL when they click on the magic link code #37145

rayane-djouah · 2024-02-23T16:17:28Z

Details

This PR is a follow up to #36390

Fixed Issues

$ #36603
PROPOSAL: N/A

Tests

Logout if you already logged in.
Start the sign in process with an email.
Copy the magic link received by email.
Change it to dev or staging link and add ?exitTo=/settings/preferences at the end of the link.
Tap on the modified magic link with target path.
Verify that the user is signed in and redirected automatically to the target path in the app.
Verify that there is no need to click "just sign in here" link on a displayed magic code page.
Verify that magic code page or abracadabra page are not displayed for a moment before navigation.
After login, return to previous page via device back navigation and also app back button.
Verify that the app returns to the previous page when returning via back button. And that the user is able to return to the home screen.
Revisit the same url and verify that the redirected automatically to the target path in the app.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.Recording.2024-02-25.171843.mp4

Android: mWeb Chrome

mweb.chrome.webm

iOS: Native

ios.Recording.2024-02-25.164329.mp4

iOS: mWeb Safari

mweb.safari.Recording.2024-02-25.162910.mp4

MacOS: Chrome / Safari

web.Recording.2024-02-25.144153.mp4

MacOS: Desktop

desktop.Recording.2024-02-25.165540.mp4

…et path

rayane-djouah · 2024-02-23T16:19:23Z

src/libs/actions/Session/index.ts

@@ -856,7 +856,7 @@ function handleExitToNavigation(exitTo: Routes | HybridAppRoute) {
        waitForUserSignIn().then(() => {
            Navigation.waitForProtectedRoutes().then(() => {
                const url = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : exitTo;
-                Navigation.navigate(url, CONST.NAVIGATION.TYPE.FORCED_UP);
+                Navigation.navigate(url);


This fixes #36603

…s already signed in

rayane-djouah · 2024-02-23T16:27:14Z

src/pages/ValidateLoginPage/index.tsx

+                if (exitTo){
+                    Session.handleExitToNavigation(exitTo);
+                    return;
+                }
                Navigation.goBack();


when user is already signed in on native app, navigation to exitTo path was not performed.
This change fixes this case.

…tion

rayane-djouah · 2024-02-23T18:28:26Z

src/pages/ValidateLoginPage/index.website.tsx

-            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && isSignedIn && <JustSignedInModal is2FARequired={false} />}
-            {autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED && (
+            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && isSignedIn && !exitTo && <JustSignedInModal is2FARequired={false}/>}
+            {autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED && !exitTo && (


this fixes #36325 (comment)

…rowser, navigation was done after clicking just sign in here link

rayane-djouah · 2024-02-23T18:46:57Z

src/pages/ValidateLoginPage/index.website.tsx

@@ -34,7 +34,7 @@ function ValidateLoginPage({
        }
        Session.initAutoAuthState(autoAuthState);

-        if (isSignedIn || !login) {
+        if (isSignedIn || (!login && !exitTo)) {


magic code page was displayed if we open the link in a separate browser, user need to click "just sign in here" link to navigate to the exit path:

with this fix, we sign in the user and navigate without the need to click "just sign in here" link

melvin-bot · 2024-02-25T16:20:37Z

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

rayane-djouah · 2024-02-25T16:21:21Z

cc @allroundexperts @techievivek

…o-a-target-url-when-they-click-on-the-magic-link-code

techievivek · 2024-02-26T05:21:43Z

Going to add @allroundexperts as C+ here since he helped review the original PR #36390, thanks for quick work here @rayane-djouah.

allroundexperts · 2024-02-26T07:46: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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.2024-02-26.at.1.28.47.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-26.at.1.23.57.PM.mov

iOS: Native

Screen.Recording.2024-02-26.at.1.21.29.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-02-26.at.1.19.20.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-26.at.12.59.29.PM.mov

MacOS: Desktop

Screen.Recording.2024-02-26.at.1.06.16.PM.mov

allroundexperts · 2024-02-26T09:02:14Z

@rayane-djouah Back button doesn't seem to work as indicated in the OP

Screen.Recording.2024-02-26.at.1.19.20.PM.mov

rayane-djouah · 2024-02-26T09:14:38Z

@allroundexperts
It's expected behavior, I updated the OP.
The back button is behaving like when we deeplink to a url in the app

allroundexperts

Works good!

techievivek

Thanks for the improvement.

OSBotify · 2024-02-26T10:51:54Z

✋ 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 · 2024-02-26T21:11:56Z

🚀 Deployed to staging by https://github.com/techievivek in version: 1.4.44-0 🚀

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

OSBotify · 2024-02-29T00:00:32Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

Fix: Unable to return to home page when logging in via link with targ…

32e35d4

…et path

rayane-djouah commented Feb 23, 2024

View reviewed changes

Fix: Native - Navigation to exitTo path not performed when the user i…

aa2d94c

…s already signed in

rayane-djouah commented Feb 23, 2024

View reviewed changes

Fix: magic code / abracadabra page appears for a moment before naviga…

c93da9c

…tion

rayane-djouah commented Feb 23, 2024

View reviewed changes

rayane-djouah added 2 commits February 23, 2024 19:29

prettier

3bf82b5

Fix: magic code page is displayed if we open the link in a separate b…

4ba040b

…rowser, navigation was done after clicking just sign in here link

rayane-djouah commented Feb 23, 2024

View reviewed changes

rayane-djouah marked this pull request as ready for review February 25, 2024 16:20

rayane-djouah requested a review from a team as a code owner February 25, 2024 16:20

melvin-bot bot requested review from cubuspl42 and removed request for a team February 25, 2024 16:20

Merge branch 'Expensify:main' into add-support-for-redirecting-user-t…

fb6195d

…o-a-target-url-when-they-click-on-the-magic-link-code

techievivek assigned rayane-djouah Feb 26, 2024

techievivek requested review from allroundexperts and techievivek and removed request for cubuspl42 February 26, 2024 05:21

allroundexperts approved these changes Feb 26, 2024

View reviewed changes

techievivek approved these changes Feb 26, 2024

View reviewed changes

techievivek merged commit 3b7aebf into Expensify:main Feb 26, 2024
17 checks passed

github-actions bot mentioned this pull request Feb 26, 2024

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

rayane-djouah deleted the add-support-for-redirecting-user-to-a-target-url-when-they-click-on-the-magic-link-code branch March 11, 2024 22:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes for feature: Add support for redirecting user to a target URL when they click on the magic link code #37145

Fixes for feature: Add support for redirecting user to a target URL when they click on the magic link code #37145

rayane-djouah commented Feb 23, 2024 •

edited

Loading

rayane-djouah Feb 23, 2024

rayane-djouah Feb 23, 2024 •

edited

Loading

rayane-djouah Feb 23, 2024

rayane-djouah Feb 23, 2024

melvin-bot bot commented Feb 25, 2024

rayane-djouah commented Feb 25, 2024

techievivek commented Feb 26, 2024

allroundexperts commented Feb 26, 2024 •

edited

Loading

allroundexperts commented Feb 26, 2024

rayane-djouah commented Feb 26, 2024

allroundexperts left a comment

techievivek left a comment

OSBotify commented Feb 26, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 29, 2024

Fixes for feature: Add support for redirecting user to a target URL when they click on the magic link code #37145

Fixes for feature: Add support for redirecting user to a target URL when they click on the magic link code #37145

Conversation

rayane-djouah commented Feb 23, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

rayane-djouah Feb 23, 2024

Choose a reason for hiding this comment

rayane-djouah Feb 23, 2024 • edited Loading

Choose a reason for hiding this comment

rayane-djouah Feb 23, 2024

Choose a reason for hiding this comment

rayane-djouah Feb 23, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Feb 25, 2024

rayane-djouah commented Feb 25, 2024

techievivek commented Feb 26, 2024

allroundexperts commented Feb 26, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allroundexperts commented Feb 26, 2024

rayane-djouah commented Feb 26, 2024

allroundexperts left a comment

Choose a reason for hiding this comment

techievivek left a comment

Choose a reason for hiding this comment

OSBotify commented Feb 26, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 29, 2024

rayane-djouah commented Feb 23, 2024 •

edited

Loading

rayane-djouah Feb 23, 2024 •

edited

Loading

allroundexperts commented Feb 26, 2024 •

edited

Loading