Skip to content

fix: sign out user when session expires#91619

Open
nabi-ebrahimi wants to merge 10 commits into
Expensify:mainfrom
nabi-ebrahimi:fix/session-expiration-signout
Open

fix: sign out user when session expires#91619
nabi-ebrahimi wants to merge 10 commits into
Expensify:mainfrom
nabi-ebrahimi:fix/session-expiration-signout

Conversation

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor

@nabi-ebrahimi nabi-ebrahimi commented May 25, 2026

Explanation of Change

When short-lived auth tokens (used for support/delegate sessions) expire, the app previously got stuck unable to re-authenticate, requiring users to sign out and back in manually. This change detects when the auth process has completed, but stale state flags remain, clears them, and allows normal re-authentication to proceed automatically.

Fixed Issues

$ #90544
PROPOSAL: #90544 (comment)

Tests

  1. Open any chat
  2. Open DevTools → Console.
  3. Run:
(async () => {
    const session = await window.Onyx.get('session');

    localStorage.setItem('issue90544_originalSession', JSON.stringify(session ?? {}));

    await window.Onyx.merge('session', {
        authToken: 'invalid-auth-token-for-issue-90544',
        encryptedAuthToken: 'invalid-auth-token-for-issue-90544',
        creationDate: Date.now() - 3 * 60 * 60 * 1000,
        isAuthenticatingWithShortLivedToken: true,
    });

    console.log('90544 mock applied. Now send a message or perform another authenticated action.');
})();
  1. Wait 2-3 seconds.
  2. Send a message or try another authenticated action.
  3. Observe for at least 2 minutes.
  4. Verified that the app redirct to login page
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// 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

Not applicable.

Android: mWeb Chrome

Not applicable.

iOS: Native

Not applicable.

iOS: mWeb Safari

Not applicable.

MacOS: Chrome / Safari
Screen.Recording.2026-05-25.at.6.48.11.PM.mov

@nabi-ebrahimi nabi-ebrahimi marked this pull request as ready for review May 25, 2026 14:41
@nabi-ebrahimi nabi-ebrahimi requested review from a team as code owners May 25, 2026 14:41
@melvin-bot melvin-bot Bot requested review from brunovjk and heyjennahay and removed request for a team May 25, 2026 14:41
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 25, 2026

@brunovjk 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 melvin-bot Bot requested review from a team and marcochavezf and removed request for a team May 25, 2026 14:41
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 25, 2026

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

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: be102d76e0

ℹ️ 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".

Comment thread src/libs/Reauthentication.ts Outdated
// Prevent re-authentication if authentication with shortLiveToken is in progress
if (isAuthenticatingWithShortLivedToken) {
Log.hmmm('[Reauthenticate] Authentication with shortLivedToken is in progress. Re-authentication aborted.', {
if (account?.isLoading) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Avoid clearing short-lived auth state before account is loaded

When isAuthenticatingWithShortLivedToken is true but ONYXKEYS.ACCOUNT has not been hydrated yet, account is undefined so this check falls through to the "stale state" branch and clears the short-lived auth flags. That can happen during startup races (session loaded before account), and then reauthenticate() proceeds with normal credentials that may not exist yet, potentially redirecting the user to sign-in in the middle of a valid short-lived-token login. Previously this path always aborted while short-lived auth was active, so this introduces a real login interruption risk.

Useful? React with 👍 / 👎.

@codecov
Copy link
Copy Markdown

codecov Bot commented May 26, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...c/libs/actions/Session/clearShortLivedAuthState.ts 100.00% <100.00%> (ø)
src/libs/Reauthentication.ts 77.52% <61.11%> (+6.29%) ⬆️
src/libs/Middleware/Reauthentication.ts 78.65% <73.07%> (+6.34%) ⬆️
... and 15 files with indirect coverage changes

@brunovjk
Copy link
Copy Markdown
Contributor

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5f96b37385

ℹ️ 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".

Comment thread src/libs/Middleware/Reauthentication.ts Outdated
})
.catch((error) => {
if (isExpiredSessionError(error)) {
return handleExpiredSession(request, isFromSequentialQueue, undefined, true).catch((reauthenticationError) => {
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Respect offline state before retrying HTTP 407 auth flow

The new HTTP-407 catch path forces handleExpiredSession(..., true), which bypasses the offline guard and can trigger full reauthentication retries even when the app is already offline by the time reauth starts. In that case, reauthenticate() keeps retrying Authenticate and eventually redirects to sign-in after max retries, whereas the existing body-407 path explicitly avoids reauth while offline. This creates a regression for flaky connections where users can be signed out solely because connectivity dropped right after receiving the 407 response.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about this comment @nabi-ebrahimi? I think it makes sense, but I want to know your thoughts. Thank you.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brunovjk Thank you for the feedback and for pointing this out. I agree that the HTTP 407 path should respect offline state in the same way as the existing body-407 path. Without this safeguard, unstable network conditions could incorrectly trigger reauthentication retries and potentially sign the user out. I’ve updated the thrown-407 flow to honor the offline check and added regression test coverage for this scenario.

@brunovjk
Copy link
Copy Markdown
Contributor

Using the code snippet you provided, I can reproduce the bug in the last main, still in dev, normally. However, in our PR here, the error message doesn't appear, but we aren't redirected to the login screen.

Screen.Recording.2026-05-26.at.20.18.31.mov

Did everything go well in your tests?

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented May 28, 2026

Using the code snippet you provided, I can reproduce the bug in the last main, still in dev, normally. However, in our PR here, the error message doesn't appear, but we aren't redirected to the login screen.

@brunovjk, thanks for checking. That matches what I’m seeing as well: on main, the snippet still reproduces the original bug, while in this PR the flow gets stuck before completing the standard expired-session handling. As a result, neither the error message is shown nor the redirect to sign-in occurs. I traced this to the reauthentication edge cases introduced here, and I’ve updated those paths to ensure the session-expiration flow completes consistently. Could you please take another look at this?

@brunovjk
Copy link
Copy Markdown
Contributor

brunovjk commented May 28, 2026

Thank you for the updates @nabi-ebrahimi. But it still won't "log out" for me:

Screen.Recording.2026-05-28.at.12.12.56.mov

I have to leave now, when I get back I'll investigate further.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants