Preserve information about saml session when logging out previous user V2 by jnowakow · Pull Request #90449 · Expensify/App

jnowakow · 2026-05-13T09:11:19Z

Explanation of Change

SSO login works by redirecting user to www.expensify.com then to IdP and back to App. All necessary information are passed in the URL. One of parameter is isSAML. It's important information stored on session object. Without it logout is not working properly because we do not logout user via SSO. One piece of logic in the OD -> ND redirection is navigation to LogoutPreviousUserPage. This screen ignored isSAML parameter from URL causing problem with logout.

Fixed Issues

$ #85937
PROPOSAL: N/A

Tests

Log in via SAML
Log out
Verify that pop up shows up and closes immediately
Log in again and verify that you have to login in on via IdP.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Log in via SAML
Log out
Verify that pop up shows up and closes immediately
Log in again and verify that you have to login in on via IdP.

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

SLO-fixed.mov

…when loging out previous user""

melvin-bot · 2026-05-13T09:12:01Z

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

melvin-bot · 2026-05-13T09:12:43Z

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

jnowakow · 2026-05-13T09:16:07Z

PR got revert last time because of problems on Staging. I'm working setting up account/domain that I could use to test SSO flow on staging

pecanoro · 2026-05-13T14:52:52Z

@huult Since this one is related to this #86416, should you review this one as well?

huult · 2026-05-14T03:15:16Z

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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

huult · 2026-05-14T03:19:10Z

@pecanoro @jnowakow It seems like we reverted this in this PR?

jnowakow · 2026-05-14T06:09:20Z

Yes, it's revert of revert. It's the same code as in #89894

pecanoro · 2026-05-14T15:53:24Z

@jnowakow Is it a straight revert? If it's straight revert maybe we don't need full review. Why did we revert it on the first place? There are a couple of things linked

huult · 2026-05-15T02:26:44Z

@jnowakow This was already reverted, so I think we can close this PR. Do we have any plans to open a new PR for a different fix?

jnowakow · 2026-05-15T10:07:26Z

@pecanoro, @huult, it's straight revert. Original PR was reverted to fix this issue. Problem is that it was bug was found on staging and I can't test it on this environment. I can only test on dev where everything works fine. I've tried setting up domain that works on staging but without success now. #90114 looks like backend redirects to wrong URL so it's not issue introduced by this PR. I suspect that it's because applausetester+saml1@applause.expensifail.com is redirected back to staging.new.expenisfy.com while App is expecting new.expenisfy.com. That's why I think it would work (and worked previously) on prod.

jnowakow · 2026-05-15T10:12:39Z

However, I'll take a look at the links configuration and will see if something can be improved/simplified

pecanoro · 2026-05-15T18:21:59Z

@jnowakow What are next steps then? I am bit confused about the last message 😄

huult · 2026-05-18T01:05:57Z

Yes, we resolved this in the Slack thread:
https://expensify.slack.com/archives/C049HHMV9SM/p1778837894069739?thread_ts=1777980093.597529&cid=C049HHMV9SM

@jnowakow Please close this PR.

jnowakow · 2026-05-18T10:40:34Z

Yes, we resolved this in the Slack thread: https://expensify.slack.com/archives/C049HHMV9SM/p1778837894069739?thread_ts=1777980093.597529&cid=C049HHMV9SM

@jnowakow Please close this PR.

@huult it's different issue

jnowakow · 2026-05-20T08:04:01Z

Screen.Recording.2026-05-20.at.10.37.30.mov
I see the issue is happening again. Is this included in this fix?

It looks like navigation related issue not connected this one. Looks like when AuthScreens are dismissed PublicScreens show last visible screen which is transition screen

…slo-once-again

jnowakow · 2026-05-20T08:07:39Z

Could you sync with main?

Done!

pecanoro · 2026-05-27T14:57:56Z

@huult Friendly bump!

huult · 2026-05-28T01:25:28Z

@huult Friendly bump!

@pecanoro @jnowakow has a question for the internal team and is waiting for their input: #90449 (comment)

…slo-once-again

pecanoro · 2026-06-03T00:40:29Z

@huult All yours again!

huult · 2026-06-03T01:42:39Z

@pecanoro is this PR ready for review again? I don't see @jnowakow pinging for a re-review.

huult · 2026-06-03T02:32:52Z

    const isWeb = getPlatform() === CONST.PLATFORM.WEB;
    const queryString = isWeb ? `referer=ecash&authToken=${authToken}` : `appversion=${pkg.version}&referer=ecash&authToken=${authToken}`;
    const expectedURL = isWeb ? CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL : CONST.SAML_REDIRECT_URL;
+


Please remove this space, it's unnecessary.

huult · 2026-06-03T02:38:30Z

        // Even if the user was already authenticated in NewDot, we need to reauthenticate them with shortLivedAuthToken,
        // because the old authToken stored in Onyx may be invalid.
-        signInWithShortLivedAuthToken(shortLivedAuthToken);
+        signInWithShortLivedAuthToken(shortLivedAuthToken, !!isSAML);


I see this change is similar to your previous change, but it is causing an issue: #90114. Could you please test this?

It's crucial line of the PR. #90114 is caused by configuration issue on staging. We were discussing it

We were discussing it

~~If possible, could you please mention this discussion here as well? Thanks. It will make future investigations easier if we encounter a similar issue again.~~

…slo-once-again

huult · 2026-06-04T01:12:53Z

Could you check the failed checks?

huult · 2026-06-08T03:50:36Z

        // Even if the user was already authenticated in NewDot, we need to reauthenticate them with shortLivedAuthToken,
        // because the old authToken stored in Onyx may be invalid.
-        signInWithShortLivedAuthToken(shortLivedAuthToken);
+        signInWithShortLivedAuthToken(shortLivedAuthToken, !!isSAML);


Suggested change

signInWithShortLivedAuthToken(shortLivedAuthToken, !!isSAML);

const {isProduction} = useEnvironment();

...

const shouldPassSAML = isProduction ? !!isSAML : undefined;

signInWithShortLivedAuthToken(shortLivedAuthToken, shouldPassSAML);

@jnowakow I think this is only needed for production, so we should add a check like above. Also, please add a comment explaining why we need to pass SAML in production.

Why is it needed only for production? We shouldn't ignore this information on any environment

If we use this option for staging, will this issue come back? #90114

If IdP configuration won't be fixed then probably yes. But adding this check means "fix the bug on production and leave it on staging/dev" so I think it's even more hacky than what I propose earlier

I think it's different because we don’t currently support staging and dev, so isSAML is only passed in production when calling signInWithShortLivedAuthToken. Adding this as suggested seems reasonable. But if there are concerns, we should also check with @pecanoro and @AndrewGable.

Dev works if you have correct IdP, so I don't think we should block. But let's wait for @pecanoro or @AndrewGable for their opinion

jnowakow · 2026-06-09T07:18:07Z

Could you check the failed checks?

Failing tests don't look related. Merging main should fix it

…slo-once-again

huult · 2026-06-16T03:23:50Z

I think the next step is for @AndrewGable to share his thoughts on this.

huult · 2026-06-16T08:22:22Z

@jnowakow Are you still maintaining this PR? I'm asking because I noticed that you left the Slack group. cc @pecanoro

suneox · 2026-06-22T02:25:10Z

I can help with this as thread

suneox · 2026-06-22T11:26:41Z

I'll create another PR for this one once the SSO setup is complete.

mateuuszzzzz · 2026-06-23T08:06:51Z

@huult I took over this PR, however I don't have access to this slack thread that @suneox mentioned. Nevertheless, PR is in complete state and SSO setup is complete as @suneox said

huult · 2026-06-23T08:16:01Z

@mateuuszzzzz, I'm not sure whether you'll be taking over this PR since @suneox has already been assigned to it.

mateuuszzzzz · 2026-06-23T08:23:06Z

Got it! I was OOO last week and missed this fact 😅 Anyways, let me know if you need any help from me regarding this PR

pecanoro · 2026-07-21T15:01:35Z

Closing per #85937 (comment)

Revert "[CP Staging] Revert "Preserve information about saml session …

85a2301

…when loging out previous user""

jnowakow requested review from a team as code owners May 13, 2026 09:11

melvin-bot Bot assigned jnowakow May 13, 2026

melvin-bot Bot requested review from flaviadefaria and pecanoro and removed request for a team May 13, 2026 09:11

jnowakow requested review from a team and AndrewGable and removed request for pecanoro May 13, 2026 09:12

melvin-bot Bot requested a review from pecanoro May 13, 2026 09:12

melvin-bot Bot removed the request for review from a team May 13, 2026 09:12

AndrewGable requested a review from huult May 13, 2026 20:16

jnowakow added 2 commits May 18, 2026 15:32

Fix logout on staging

126c4d0

Fix SSO on dev

08013a3

Merge branch 'main' into revert-90221-revert-89894-jnowakow/fix-saml-…

490bec7

…slo-once-again

huult mentioned this pull request May 29, 2026

Web - SSO - Unable to sign out #85937

Open

7 tasks

jnowakow added 2 commits June 1, 2026 09:55

Merge branch 'main' into revert-90221-revert-89894-jnowakow/fix-saml-…

ef8d478

…slo-once-again

remove hacky solution

c8a6a9b

jnowakow dismissed pecanoro’s stale review via c8a6a9b June 1, 2026 08:09

huult reviewed Jun 3, 2026

View reviewed changes

jnowakow added 2 commits June 3, 2026 15:05

Merge branch 'main' into revert-90221-revert-89894-jnowakow/fix-saml-…

837003b

…slo-once-again

revert unnecessary changes

4f6337c

huult reviewed Jun 8, 2026

View reviewed changes

jnowakow added 2 commits June 9, 2026 09:18

Merge branch 'main' into revert-90221-revert-89894-jnowakow/fix-saml-…

1ee393e

…slo-once-again

Merge branch 'main' into revert-90221-revert-89894-jnowakow/fix-saml-…

ca09148

…slo-once-again

pecanoro assigned suneox Jun 22, 2026

pecanoro closed this Jul 21, 2026

-        signInWithShortLivedAuthToken(shortLivedAuthToken, !!isSAML);
+const {isProduction} = useEnvironment();
+...
+const shouldPassSAML = isProduction ? !!isSAML : undefined;
+signInWithShortLivedAuthToken(shortLivedAuthToken, shouldPassSAML);

Uh oh!

Conversation

jnowakow commented May 13, 2026 • edited by pecanoro 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!

melvin-bot Bot commented May 13, 2026

Uh oh!

melvin-bot Bot commented May 13, 2026

Uh oh!

jnowakow commented May 13, 2026

Uh oh!

pecanoro commented May 13, 2026

Uh oh!

huult commented May 14, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

huult commented May 14, 2026

Uh oh!

jnowakow commented May 14, 2026

Uh oh!

pecanoro commented May 14, 2026

Uh oh!

huult commented May 15, 2026

Uh oh!

jnowakow commented May 15, 2026

Uh oh!

jnowakow commented May 15, 2026

Uh oh!

pecanoro commented May 15, 2026

Uh oh!

huult commented May 18, 2026

Uh oh!

jnowakow commented May 18, 2026

Uh oh!

jnowakow commented May 20, 2026

Uh oh!

jnowakow commented May 20, 2026

Uh oh!

pecanoro commented May 27, 2026

Uh oh!

huult commented May 28, 2026

Uh oh!

pecanoro commented Jun 3, 2026

Uh oh!

huult commented Jun 3, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

huult Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

huult commented Jun 4, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jnowakow commented Jun 9, 2026

Uh oh!

jnowakow commented May 13, 2026 •

edited by pecanoro

Loading

huult Jun 4, 2026 •

edited

Loading