Skip to content

Fix SAML mobile auth: stale closure, logout blank screen, frequent logouts - #91596

Closed
MelvinBot wants to merge 2 commits into
mainfrom
claude-fixSAMLMobileAuthIssues
Closed

Fix SAML mobile auth: stale closure, logout blank screen, frequent logouts#91596
MelvinBot wants to merge 2 commits into
mainfrom
claude-fixSAMLMobileAuthIssues

Conversation

@MelvinBot

@MelvinBot MelvinBot commented May 25, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

This PR addresses three SAML/IDP authentication issues on mobile:

  1. Android stuck on loading after IDP auth — The handleNavigationStateChange callback in SAMLSignInPage/index.native.tsx closed over stale account and credentials React state. While the user was in the external IDP browser, Onyx could update these values, but the callback still referenced the old closure. Now uses refs to read the latest Onyx values at callback time.

  2. iOS blank white screen on logout — When a SAML user dismissed the IDP logout browser, callSAMLSignOut rejected with 'Logout cancelled', and the outer .catch in signOutAndRedirectToSignIn only logged a warning without ever calling redirectToSignIn(). The app was left in limbo. Now callSAMLSignOut resolves gracefully on dismissal instead of rejecting, and the outer .catch includes a failsafe redirectToSignIn().

  3. Frequent/unexpected logouts — The reauthentication guard in Reauthentication.ts unconditionally redirected all SAML users to sign-in on any token expiry, even when valid auto-generated credentials were available for silent reauthentication. Now the SAML guard only redirects when auto-generated credentials are missing, allowing SAML users with stored credentials to reauthenticate silently like other users.

Fixed Issues

$ #89613
PROPOSAL: #89613 (comment)

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

Offline tests

// TODO: The human co-author must fill out offline test steps

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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 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.ts 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 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
AI Tests
  • Prettier: Passed (all 3 files unchanged — already formatted)
  • TypeScript (typecheck-tsgo): Passed (pre-existing errors in unrelated files: MapView/utils.ts, API/types.ts, ConvertGpsPointsTo2DArray.ts)
  • Lint (lint-changed): Passed (no lintable files changed detected by script)
  • Jest tests: Passed — tests/actions/SessionTest.ts (29/29), tests/unit/SessionUtilsTest.ts, tests/unit/selectors/SessionTest.ts
  • React Compiler Compliance: Could not run (environmental issue: origin/ branch reference not found in CI checkout)

MelvinBot and others added 2 commits May 25, 2026 11:24
@MelvinBot @aimane-chnaif
Fix SAML mobile auth: stale closure, logout blank screen, frequent lo…
1d9e31e 
…gouts

- Use refs to read latest Onyx values in SAMLSignInPage native callback
  instead of closing over stale React state
- Handle cancelled SAML logout gracefully by resolving instead of
  rejecting, and add failsafe redirectToSignIn in the outer catch
- Allow SAML users with auto-generated credentials to reauthenticate
  silently instead of unconditionally redirecting to sign-in

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot @aimane-chnaif
Merge remote-tracking branch 'origin/main' into claude-fixSAMLMobileA…
7af03ae 
…uthIssues

Co-authored-by: Aimane Chnaif <aimane-chnaif@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team May 25, 2026 11:27
@MelvinBot MelvinBot mentioned this pull request May 25, 2026
Closed
2 of 7 tasks
@codecov

codecov Bot commented May 25, 2026 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/libs/Reauthentication.ts 71.23% <50.00%> (ø)
src/libs/actions/Session/index.ts 42.43% <16.66%> (-0.15%) ⬇️
src/pages/signin/SAMLSignInPage/index.native.tsx 0.00% <0.00%> (ø)
... and 8 files with indirect coverage changes

@aimane-chnaif

aimane-chnaif commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot close this PR as no longer needed

@MelvinBot

MelvinBot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

Closing this PR as no longer needed, per aimane-chnaif's request. 👍

@MelvinBot MelvinBot closed this Jul 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@aimane-chnaif aimane-chnaif

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@MelvinBot @aimane-chnaif @quinthar