Fix SAML cancel leaving sign-in page without email field by MelvinBot · Pull Request #88760 · Expensify/App

MelvinBot · 2026-04-25T01:29:42Z

Explanation of Change

When a SAML-required user closes the browser without completing login, the app navigates back to SignInPage but shows only the background animation with no email field. This happens because the cancel and error paths in SAMLSignInPage/index.native.tsx call Navigation.goBack() without first clearing sign-in data, leaving credentials.login set and preventing any form from rendering.

This fix adds clearSignInData() before Navigation.goBack() in both the cancel path (response.type !== 'success') and the .catch handler, matching the existing back button and error handler patterns already in the same file. Also wraps Navigation.goBack() in Navigation.isNavigationReady().then() for consistency with those same patterns.

Fixed Issues

$ #88206
PROPOSAL: #88206 (comment)

Tests

Precondition: SAML requirement for login is enabled on OD.

Launch Expensify app.
Enter applausetester@applause.expensifail.com on email field.
Tap Continue.
Tap close button on the browser.
Verify the app returns to the login page with the email field visible.
Verify that no errors appear in the JS console.

Offline tests

N/A - This fix addresses SAML sign-in browser cancellation, which requires an active network connection to initiate.

QA Steps

Precondition: SAML requirement for login is enabled on OD.

Launch Expensify app.
Enter applausetester@applause.expensifail.com on email field.
Tap Continue.
Tap close button on the browser.
Verify the app returns to the login page with the email field visible.
Verify that no errors appear in the JS console.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

When a SAML-required user closes the browser without completing login, the cancel and error paths now call clearSignInData() before navigating back, matching the existing back button behavior. This ensures SignInPage correctly shows the email field instead of a blank page. Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>

codecov · 2026-04-25T01:37:17Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/pages/signin/SAMLSignInPage/index.native.tsx	`0.00% <0.00%> (ø)`
... and 203 files with indirect coverage changes

hoangzinh · 2026-04-27T06:55:40Z

@MelvinBot make this PR ready

hoangzinh · 2026-04-27T06:56:29Z

@MelvinBot copy this into QA tests

Precondition:

SAML requirement for login is enabled on OD.

Launch Expensify app.
Enter applausetester@applause.expensifail.com on email field
Tap Continue.
Tap close button on the browser.
App will return to login page with email field.

hoangzinh · 2026-04-27T06:57:07Z

@MelvinBot can you check off all PR author Checklist. I will ensure to all of them are checked

MelvinBot · 2026-04-27T06:58:01Z

🤖 I've updated the PR body with the test steps:

Tests and QA Steps: Filled in with the SAML cancel flow steps you provided.
Offline tests: Marked as N/A since SAML sign-in requires an active network connection.
Checklist items: Checked off the testing steps checkboxes.

Please mark this PR as "Ready for review" when you're ready — I wasn't able to do it automatically.

MelvinBot · 2026-04-27T07:01:29Z

🤖 Done — all PR Author Checklist items are now checked off.

hoangzinh · 2026-04-27T07:13:20Z

@MelvinBot please mark this PR ready for review

MelvinBot · 2026-04-27T07:14:42Z

🤖 Done! This PR has been marked as ready for review.

melvin-bot · 2026-04-27T07:14:44Z

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

github-actions · 2026-04-27T07:16:58Z

            .then((response: WebBrowserAuthSessionResult) => {
                if (response.type !== 'success') {
-                    Navigation.goBack();
+                    clearSignInData();


❌ CONSISTENCY-3 (docs)

The clearSignInData() + Navigation.isNavigationReady().then(() => Navigation.goBack()) block is duplicated three times in this file: in the cancel path (response.type !== 'success'), in the .catch handler, and in the onBackButtonPress callback. This increases maintenance overhead -- if the cleanup logic changes, all three sites must be updated.

Extract a helper function to eliminate the duplication:

const handleExitSAMLFlow = useCallback(() => { clearSignInData(); Navigation.isNavigationReady().then(() => { Navigation.goBack(); }); }, []);

Then use handleExitSAMLFlow() in all three locations (cancel path, catch handler, and onBackButtonPress).

Reviewed at: 0b70b7b | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

@MelvinBot what do you think about this feedback?

The suggestion is valid. The clearSignInData() + Navigation.isNavigationReady().then(() => Navigation.goBack()) block is identical in all three places (cancel path, catch handler, and onBackButtonPress). Extracting a handleExitSAMLFlow callback would reduce duplication with no behavioral change.

Note: the pattern in handleNavigationStateChange (line 63-69) is intentionally different — it also calls setAccountError and navigates to ROUTES.HOME, so it should NOT be folded in.

Want me to implement this refactor?

@MelvinBot yes please implement

@MelvinBot please implement

Done — extracted a handleExitSAMLFlow callback that's now used in all three places (cancel path, catch handler, and back button press).

hoangzinh · 2026-04-27T07:25:11Z

@MelvinBot I faced the same bug in web

Screen.Recording.2026-04-27.at.14.22.38.mov

When a SAML-required user browser-backs from the IdP on web, credentials.login is still set in Onyx but clearSignInData() is async. This caused a blank SignInPage with no form visible until the Onyx update propagated. Now shouldShowLoginForm is true immediately when the SAML-reload guard fires. Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>

melvin-bot · 2026-04-27T07:33:55Z

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

MelvinBot · 2026-04-27T07:35:57Z

🤖 Pushed a fix for the web SAML cancel bug.

Root cause: When a SAML-required user browser-backs from the IdP on web, credentials.login is still persisted in Onyx but account.isLoading is falsy. The guard in SignInPage.tsx:109 correctly calls clearSignInData(), but since that's an async Onyx.multiSet, the current render cycle still has hasLogin=true — making shouldShowLoginForm=false and no other form matches either (isSAMLRequired excludes the validate code form). Result: blank page with no form visible.

Fix: SignInPage.tsx:117 — when the SAML-reload guard fires, shouldShowLoginForm is now immediately set to true so the login form renders without waiting for the async Onyx clear.

MelvinBot · 2026-04-27T09:55:16Z

🤖 This PR is already fully set up:

✅ All PR Author Checklist items are checked off
✅ PR is marked as ready for review
✅ All CI checks pass
✅ Web SAML cancel fix has been pushed

If there's something specific you'd like me to implement, please let me know what it is!

Extract the repeated clearSignInData() + Navigation.isNavigationReady().then(goBack) pattern into a single handleExitSAMLFlow useCallback, used by the cancel path, catch handler, and back button press. Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>

joekaufmanexpensify

Gotta make sure we keep that email field to sign in! 😄

hoangzinh · 2026-04-28T00:58:43Z

🤖 Pushed a fix for the web SAML cancel bug.

Root cause: When a SAML-required user browser-backs from the IdP on web, credentials.login is still persisted in Onyx but account.isLoading is falsy. The guard in SignInPage.tsx:109 correctly calls clearSignInData(), but since that's an async Onyx.multiSet, the current render cycle still has hasLogin=true — making shouldShowLoginForm=false and no other form matches either (isSAMLRequired excludes the validate code form). Result: blank page with no form visible.

Fix: SignInPage.tsx:117 — when the SAML-reload guard fires, shouldShowLoginForm is now immediately set to true so the login form renders without waiting for the async Onyx clear.

@MelvinBot it seems doesn't work to me on web

On web, SAMLSignInPage uses window.location.replace() to redirect to the IdP, which causes a full page reload on browser-back. The React state hasInitiatedSAMLLogin resets to false, and depending on account.isLoading during Onyx hydration, shouldInitiateSAMLLogin may fire again (re-redirecting to IdP) before isClearingSAMLSignInData gets a chance to clear credentials. Fix: use sessionStorage to persist the SAML initiation flag across page reloads. SignInPage reads and clears this flag on mount, preventing re-initiation and forcing the sign-in data clear path regardless of account.isLoading timing. Co-authored-by: Vinh Hoang <hoangzinh@users.noreply.github.com>

MelvinBot · 2026-04-28T01:09:44Z

🤖 Pushed a fix for the web SAML cancel issue.

Root cause: On web, SAMLSignInPage/index.tsx uses window.location.replace() to redirect to the IdP, which leaves the React app entirely. When the user browser-backs, the app does a full page reload. The React state hasInitiatedSAMLLogin resets to false, and depending on account.isLoading during Onyx hydration, shouldInitiateSAMLLogin may fire again — re-redirecting to the IdP before isClearingSAMLSignInData gets a chance to clear credentials.

Fix: Use sessionStorage to persist the SAML initiation flag across page reloads. SAMLSignInPage/index.tsx:30-32 sets the flag before the redirect. SignInPage.tsx:180-190 reads and clears it on mount, preventing SAML re-initiation and forcing the data-clear path regardless of account.isLoading timing.

hoangzinh · 2026-04-28T09:40:32Z

@MelvinBot can you revert those commits

I tested on a wrong account

This reverts commit 452c858.

…data on web" This reverts commit eac87f2.

MelvinBot · 2026-04-28T09:46:38Z

🤖 Reverted both commits as requested:

452c858 — "Fix web SAML cancel not showing login form on browser-back"
eac87f2 — "Show login form immediately when clearing stale SAML sign-in data on web"

hoangzinh · 2026-04-28T11:15:42Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

Screen.Recording.2026-04-28.at.17.14.21.mov

Android: mWeb Chrome

Screen.Recording.2026-04-28.at.18.17.07.mov

iOS: HybridApp

Screen.Recording.2026-04-28.at.20.16.50.mov

iOS: mWeb Safari

Screen.Recording.2026-04-28.at.20.18.03.mov

MacOS: Chrome / Safari

Screen.Recording.2026-04-28.at.18.13.09.mov

hoangzinh · 2026-04-28T13:36:56Z

@grgia all yours

OSBotify · 2026-04-28T14:50:16Z

✋ 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 · 2026-04-28T15:54:57Z

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-04-28T16:13:26Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #88760.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3f9b2dd-f5c1c69-a83f6f2c390d3c8c5492af3c552c07cc8fb5d9c3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-3f9b2dd-f5c1c69-29f317db697ed59d2a9b2d71406956e2195912e7/index.html

Web 🕸️
https://88760.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-30T23:07:07Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.3.65-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-30T23:08:30Z

No help site changes required. This PR fixes an internal app navigation bug (blank screen after canceling the SAML browser on native). The existing SAML help articles (Set-Up-SAML-SSO, Troubleshoot-SAML-SSO-Login) cover server-side configuration and error messages — none of that is affected by this code change.

MelvinBot assigned hoangzinh Apr 25, 2026

MelvinBot requested a review from a team April 25, 2026 01:29

MelvinBot mentioned this pull request Apr 25, 2026

[$250] Android - SAML - Login page without email field opens after returning from SAML login page #88206

Open

7 tasks

MelvinBot marked this pull request as ready for review April 27, 2026 07:14

MelvinBot requested a review from a team as a code owner April 27, 2026 07:14

melvin-bot Bot requested review from hoangzinh and joekaufmanexpensify and removed request for a team April 27, 2026 07:14

melvin-bot Bot removed the request for review from a team April 27, 2026 07:14

github-actions Bot reviewed Apr 27, 2026

View reviewed changes

MelvinBot requested a review from a team as a code owner April 27, 2026 07:33

melvin-bot Bot requested a review from grgia April 27, 2026 07:33

melvin-bot Bot removed the request for review from a team April 27, 2026 07:33

joekaufmanexpensify previously approved these changes Apr 27, 2026

View reviewed changes

MelvinBot dismissed joekaufmanexpensify’s stale review via 452c858 April 28, 2026 01:09

MelvinBot added 2 commits April 28, 2026 09:46

Revert "Fix web SAML cancel not showing login form on browser-back"

6f18aaa

This reverts commit 452c858.

Revert "Show login form immediately when clearing stale SAML sign-in …

5ebb243

…data on web" This reverts commit eac87f2.

hoangzinh approved these changes Apr 28, 2026

View reviewed changes

grgia approved these changes Apr 28, 2026

View reviewed changes

grgia merged commit 3f9b2dd into main Apr 28, 2026
42 checks passed

grgia deleted the claude-fixSAMLCancelSignInState branch April 28, 2026 14:41

OSBotify mentioned this pull request Apr 30, 2026

Deploy Checklist: New Expensify 2026-04-30 #89315

Open

Conversation

MelvinBot commented Apr 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Apr 25, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

hoangzinh commented Apr 27, 2026

Uh oh!

hoangzinh commented Apr 27, 2026

Uh oh!

hoangzinh commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

hoangzinh commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

melvin-bot Bot commented Apr 27, 2026

Uh oh!

github-actions Bot Apr 27, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-3 (docs)

Uh oh!

hoangzinh Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Apr 27, 2026

Uh oh!

melvin-bot Bot commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

MelvinBot commented Apr 27, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

hoangzinh commented Apr 28, 2026

Uh oh!

MelvinBot commented Apr 28, 2026

Uh oh!

hoangzinh commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh commented Apr 28, 2026

Uh oh!

Uh oh!

OSBotify commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026

MelvinBot commented Apr 25, 2026 •

edited

Loading

codecov Bot commented Apr 25, 2026 •

edited by github-actions Bot

Loading

hoangzinh commented Apr 28, 2026 •

edited

Loading