[Part 2] Remove Onyx.connect(ONYXKEYS.SESSION) in /Session/index.ts: thread sesion through signOutAndRedirectToSignIn by truph01 · Pull Request #97963 · Expensify/App

truph01 · 2026-08-06T11:50:43Z

Explanation of Change

Threaded session through these chains:

- signOutAndRedirectToSignIn
- signOutAndRedirectToSignIn -> openLink 
- signOutAndRedirectToSignIn -> openLink -> connectPolicyToFinancialForce

Fixed Issues

$ #67782
PROPOSAL:

Tests

Open app
Account > Click on Sign out
Verify that user is signed out successfully

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

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 verified there are no new alerts related to the canBeMissing param for useOnyx
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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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

MacOS: Chrome / Safari

Screen.Recording.2026-08-06.at.18.50.16.mov

melvin-bot · 2026-08-06T11:51:06Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 014e759db5

ℹ️ 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-08-06T11:57:14Z

    const signOutPromise: Promise<void | Response<never>> =
        !shouldRestoreStashedSession && !shouldStashSession
-            ? signOut({autoGeneratedLogin: credentials?.autoGeneratedLogin, signedInWithSAML: !!deprecatedSession.signedInWithSAML, authToken: deprecatedSession.authToken})
+            ? signOut({autoGeneratedLogin: credentials?.autoGeneratedLogin, signedInWithSAML: !!session.signedInWithSAML, authToken: deprecatedSession.authToken})


Use the supplied session token for logout

When callers now pass an explicit session to avoid relying on module-level Onyx state, this branch still sends deprecatedSession.authToken to LOG_OUT/SAML while using the supplied session for the other logout decisions. If deprecatedSession is stale during an account/session transition, the server invalidates the wrong token or leaves the current token valid. Use session.authToken consistently here.

Useful? React with 👍 / 👎.

In the next PR, we will remove deprecatedSession. I'm not doing it in this PR because it would require a lot of changes.

chatgpt-codex-connector · 2026-08-06T11:57:14Z

-        openLink(setupLink, environmentURL);
-    }, [environmentURL, setupLink]);
+        openLink(setupLink, environmentURL, false, session);
+    }, [environmentURL, setupLink, session]);


Avoid re-opening HR setup on session updates

When the web HR flow stays mounted after openLink opens the OldDot setup URL, any subsequent SESSION Onyx update re-runs this effect because session is now in the dependency array, opening another setup URL/tab for the same click. The native variants guard this as a one-time open; keep the web flow mount-only as well, while still passing the latest session to openLink.

Useful? React with 👍 / 👎.

Resolved via 6d3bcda

codecov · 2026-08-07T04:07:54Z

Codecov Report

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

Files with missing lines	Coverage Δ
...components/ConnectToQuickbooksOnlineFlow/index.tsx	`100.00% <100.00%> (ø)`
src/components/ConnectToXeroFlow/index.tsx	`100.00% <100.00%> (ø)`
...TMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx	`73.91% <100.00%> (+0.38%)`	⬆️
...nents/Reactions/ReportActionItemEmojiReactions.tsx	`50.00% <100.00%> (+1.61%)`	⬆️
...Navigation/AppNavigator/AuthScreensInitHandler.tsx	`88.46% <100.00%> (ø)`
src/pages/LogOutPreviousUserPage.tsx	`96.42% <ø> (ø)`
...nbox/report/ReportActionItemMessageWithExplain.tsx	`90.90% <100.00%> (+0.43%)`	⬆️
...signin/SignInPageLayout/FooterRow/index.native.tsx	`75.00% <100.00%> (+2.27%)`	⬆️
...uiteTokenInput/subPages/NetSuiteTokenInputForm.tsx	`85.71% <100.00%> (+0.34%)`	⬆️
...put/subPages/connectToNetSuiteOAuthSetup.native.ts	`100.00% <100.00%> (ø)`
... and 19 more
... and 42 files with indirect coverage changes

shubham1206agra · 2026-08-07T16:59:15Z

@truph01 Fix ESLint please

truph01 · 2026-08-10T08:00:27Z

@shubham1206agra I resolved conflicts

truph01 added 3 commits August 6, 2026 18:28

fix: refactor signOutAndRedirectToSignIn

5de8203

fix: update signOutAndRedirectToSignIn

73939bc

fix: refacfor openLink

014e759

melvin-bot Bot assigned truph01 Aug 6, 2026

truph01 marked this pull request as ready for review August 6, 2026 11:51

truph01 requested review from a team as code owners August 6, 2026 11:51

melvin-bot Bot requested review from garrettmknight and shubham1206agra and removed request for a team August 6, 2026 11:51

melvin-bot Bot removed the request for review from a team August 6, 2026 11:51

truph01 mentioned this pull request Aug 6, 2026

Remove Onyx.connect() for the key: ONYXKEYS.SESSION in src/libs/actions/Session/index.ts #67782

Open

chatgpt-codex-connector Bot reviewed Aug 6, 2026

View reviewed changes

garrettmknight removed their request for review August 6, 2026 19:53

truph01 added 5 commits August 7, 2026 10:32

Merge branch 'Expensify:main' into fix/67782-v2

ecf1362

fix: lint

0d2b466

fix: type

abafbd4

fix: remove session from dep

6d3bcda

fix: test

1c4427a

truph01 added 2 commits August 10, 2026 14:59

fix: conflicts

93e84dd

fix: conflicts

12678ba

truph01 added 5 commits August 10, 2026 15:32

fix: lint

5bbb459

Merge branch 'Expensify:main' into fix/67782-v2

7611b41

fix: typecheck

0cdbc71

fix: conflicts

fbf04d8

fix: conflicts

1f059d5

fix: lint

1bfe1f5

Navigation Menu

Uh oh!

[Part 2] Remove Onyx.connect(ONYXKEYS.SESSION) in /Session/index.ts: thread sesion through signOutAndRedirectToSignIn - #97963

[Part 2] Remove Onyx.connect(ONYXKEYS.SESSION) in /Session/index.ts: thread sesion through signOutAndRedirectToSignIn#97963
truph01 wants to merge 16 commits into
Expensify:mainfrom
truph01:fix/67782-v2

truph01 commented Aug 6, 2026 •

edited

Loading

Uh oh!

melvin-bot Bot commented Aug 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Uh oh!

chatgpt-codex-connector Bot Aug 6, 2026

Uh oh!

truph01 Aug 7, 2026

Uh oh!

chatgpt-codex-connector Bot Aug 6, 2026

Uh oh!

truph01 Aug 17, 2026

Uh oh!

codecov Bot commented Aug 7, 2026 •

edited by github-actions Bot

Loading

Uh oh!

shubham1206agra commented Aug 7, 2026

Uh oh!

truph01 commented Aug 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

truph01 commented Aug 6, 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!

melvin-bot Bot commented Aug 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Aug 6, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Aug 7, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Aug 6, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Aug 17, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented Aug 7, 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!

shubham1206agra commented Aug 7, 2026

Uh oh!

truph01 commented Aug 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

truph01 commented Aug 6, 2026 •

edited

Loading

codecov Bot commented Aug 7, 2026 •

edited by github-actions Bot

Loading