Prevent OD api calls during SSO sign out by jnowakow · Pull Request #83440 · Expensify/App

jnowakow · 2026-02-25T11:31:54Z

Explanation of Change

When user is signed in via SSO during sign out the browser is opened. This puts App in the background and brings in again in foreground when browser closes. It caused OldDot to perform API calls even though authTokens was removed in the meantime. This is turn started reauthentication flow showing the browser again. Now ND informs OD that signout was started preventing any calls when app is brought to foreground.

Fixed Issues

$ #83056
PROPOSAL: N/A

MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/13872

Tests

Sign in via SSO.
Sign out.
Verify that ND login page is shown.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

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

Sign in via SSO.
Sign out.
Verify that ND login page is shown.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

2.mov

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-02-25T11:32:00Z

@jjcoffee 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-02-25T11:32:03Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

JmillsExpensify

Not a PR requiring product review.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4ab3e691ac

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-02-25T11:39:07Z

src/libs/actions/Session/index.ts

    const isSupportal = isSupportAuthToken();
    const shouldRestoreStashedSession = isSupportal || shouldForceUseStashedSession;

+    CONFIG.IS_HYBRID_APP && shouldSignOutFromOldDot && HybridAppModule.startSignOut();


Revert sign-out guard when logout request fails

startSignOut() is now triggered before the logout request, but rollback is only wired for the SAML browser-cancel path; if the later LOG_OUT call rejects (for example on network failure), control goes to the existing terminal .catch(...) and neither signOutFromOldDot() nor cancelSignOut() runs. In hybrid mode that can leave OldDot stuck in a “sign-out started” state, which blocks OD API traffic beyond this logout attempt. Please ensure all logout failure paths clear the started flag.

Useful? React with 👍 / 👎.

This is clean Mobile-Expensify when signOutFromOldDot is called

jjcoffee · 2026-02-27T12:11:19Z

@jnowakow It's my first time reviewing a Mobile-Expensify dependent PR, so forgive the stupid question 😄 Should I wait for the Mobile-Expensify PR to be merged before testing this, or how does it normally work?

jnowakow · 2026-02-27T12:28:20Z

@jjcoffee there are no stupid questions!

If you want to build and test it locally you should just checkout to this branch in App repo and then go to Mobile-Expensify and checkout there to the corresponding branch. In this case branches have the same names so it will be:

cd App
git checkout jnowakow/prevent-old-dot-calls-during-sign-out
cd Mobile-Expensify
git checkout jnowakow/prevent-old-dot-calls-during-sign-out

Now if you will build the app it have required changes both in OldDot and NewDot :D
However there is problem with rock. It doesn't recognise that native files were change and it can get things from cache :( To avoid that please go to run-build.sh and add --local to the ios or android command.

If you want to test it with AdHoc builds you can just trigger it. Since I've linked corresponding PR with MOBILE-EXPENSIFY: it will checkout there and it will build correct version. However rock can mess here as well so adhoc builds are not reliable right now :(

If testing goes well we have to merge two PRs in more or less the same time in order to deploy both changes in next release :D

jjcoffee · 2026-02-27T14:42:57Z

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

android-app-2026-02-27_19.00.42.mp4

Android: mWeb Chrome

iOS: HybridApp

ios-app-2026-02-27_17.18.55.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

jjcoffee · 2026-02-27T15:04:11Z

@jnowakow Thanks! Do you know if there's a way to test the SSO sign-in? I don't have a private domain I can use.

jnowakow · 2026-02-27T15:13:00Z

@jjcoffee I'm using Andrew's account that he set up for us. I'll send you the credentials on Slack :D

jjcoffee

LGTM! Tests well on native. We need to merge the Mobile-Expensify PR at the same time as this one. cc @AndrewGable

jjcoffee · 2026-03-09T14:57:26Z

@AndrewGable Friendly bump to review this and the Mobile-Expensify PR.

jnowakow · 2026-03-11T10:34:48Z

@AndrewGable can you take a look at this PR, please 🙏

AndrewGable · 2026-03-12T21:23:43Z

Holding on merging until Mobile-Expensify pr is mergable

codecov · 2026-03-18T18:31:26Z

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/actions/Session/index.ts	`42.62% <25.00%> (-0.17%)`	⬇️
... and 27 files with indirect coverage changes

OSBotify · 2026-03-18T18:43:02Z

✋ 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-03-18T19:10:05Z

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

github-actions · 2026-03-18T19:15:37Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5ec4b4b-9a6f3c4-86af1c66ceede0ed548d7bfb643f15e22626372b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5ec4b4b-9a6f3c4-c78cf070e8f943fd0679badebcc3f4c0f394436b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-19T20:23:48Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

jponikarchuk · 2026-03-20T12:18:25Z

Deploy Blocker #85937 was identified to be related to this PR.

jponikarchuk · 2026-03-20T12:18:48Z

This PR failing because of the issue #85937
This issue is reproducible in: Web

OSBotify · 2026-03-23T09:25:33Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

Prevent OD api calls during SSO sign out

4ab3e69

jnowakow requested review from a team as code owners February 25, 2026 11:31

melvin-bot bot assigned jnowakow Feb 25, 2026

melvin-bot bot requested a review from jjcoffee February 25, 2026 11:31

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team February 25, 2026 11:32

jnowakow requested review from a team and AndrewGable February 25, 2026 11:32

melvin-bot bot requested review from JmillsExpensify and removed request for a team February 25, 2026 11:32

JmillsExpensify reviewed Feb 25, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

jnowakow added 2 commits February 25, 2026 13:06

Fix linter

45d427b

Fix prettier

3c26530

joekaufmanexpensify removed their request for review February 25, 2026 16:51

This comment was marked as resolved.

Sign in to view

jjcoffee approved these changes Mar 2, 2026

View reviewed changes

AndrewGable approved these changes Mar 12, 2026

View reviewed changes

AndrewGable merged commit 5ec4b4b into Expensify:main Mar 18, 2026
34 checks passed

OSBotify mentioned this pull request Mar 19, 2026

Deploy Checklist: New Expensify 2026-03-19 #85862

Closed

jponikarchuk mentioned this pull request Mar 20, 2026

Web - SSO - Unable to sign out #85937

Open

7 tasks

jponikarchuk mentioned this pull request Mar 20, 2026

[Due for payment 2026-03-30] [$250] User is forwarded to onelogin on sign out without a cancel prompt #83056

Open

7 tasks

Conversation

jnowakow commented Feb 25, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 25, 2026

Uh oh!

github-actions bot commented Feb 25, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

jnowakow Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Feb 27, 2026

Uh oh!

jnowakow commented Feb 27, 2026

Uh oh!

jjcoffee commented Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jjcoffee commented Feb 27, 2026

Uh oh!

jnowakow commented Feb 27, 2026

Uh oh!

This comment was marked as resolved.

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Mar 9, 2026

Uh oh!

jnowakow commented Mar 11, 2026

Uh oh!

AndrewGable commented Mar 12, 2026

Uh oh!

Uh oh!

codecov bot commented Mar 18, 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!

OSBotify commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

github-actions bot commented Mar 18, 2026

Uh oh!

OSBotify commented Mar 19, 2026

Uh oh!

jponikarchuk commented Mar 20, 2026

Uh oh!

jponikarchuk commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jjcoffee commented Feb 27, 2026 •

edited

Loading

codecov bot commented Mar 18, 2026 •

edited by github-actions bot

Loading