Skip to content

fix: restore main session when authToken expires while in copilot mode - #93084

Merged
mountiny merged 21 commits into
Expensify:mainfrom
software-mansion-labs:war-in/fix-delegate-auth-token-expiration
Jul 13, 2026
Merged

mountiny merged 21 commits into
Expensify:mainfrom
software-mansion-labs:war-in/fix-delegate-auth-token-expiration

Conversation

@war-in

@war-in war-in commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

While connected as a delegate, the original user's credentials live in STASHED_CREDENTIALS (not CREDENTIALS, which is wiped on delegate transition), so reauth must use those. Also unified the delegate disconnect and reauth-driven restoration into a single restoreDelegateSession flow that writes SESSION before clearing Onyx and syncs OldDot via HybridAppModule.switchAccount in both paths.

When a copilot's (delegate's) auth token expires, the app should restore the user to their own account instead of getting stuck, signed out, or left on the delegated account

Fixed Issues

$ #94329
PROPOSAL:
MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/13973

Tests

How to trigger an expired auth token

Use the Troubleshoot page → invalidate auth token. This simulates the delegate/session token expiring without waiting for it to expire naturally.

Case 1

  1. Open the app on a mobile device as a NewDot user (A).
  2. Connect as copilot to another account (B).
  3. Confirm you are now seeing the copiloted account.
  4. Open the Troubleshoot page and invalidate the auth token.
  5. Return to the app and navigate around (open a chat, switch tabs).
  6. Verify you are restored to your own account (A), not the copiloted account.
  7. Verify you are not signed out.
  8. Verify OldDot and NewDot show the same account (A).

Case 2

  1. Open the app on a mobile device as a NewDot user (A).
  2. Connect as copilot to an account that is OldDot-only (B).
  3. Open the Troubleshoot page and invalidate the auth token.
  4. Immediately force-kill the app and reopen it.
  5. Verify you are taken to your own NewDot experience (A).

Case 3

  1. Open the app on a mobile device as a NewDot user (A).
  2. Connect as copilot to an account that is OldDot-only (B).
  3. Confirm you are now copiloting B in NewDot.
  4. Force-kill the app and reopen it (without invalidating the token).
  5. Verify you are still copiloting B in NewDot.
  6. Verify you are not dropped into OldDot.

Offline tests

QA Steps

Same as tests.

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

Case 1:

Screen_Recording_20260624_163822_Expensify.Adhoc.mp4

Case 2:

Screen_Recording_20260624_164327_Expensify.Adhoc.mp4

Case 3:

Screen_Recording_20260624_164517_Expensify.Adhoc.mp4
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@codecov

codecov Bot commented Jun 9, 2026

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/actions/Session/index.ts 42.28% <100.00%> (ø)
src/libs/Reauthentication.ts 65.04% <81.81%> (+2.54%) ⬆️
src/pages/inbox/ReportNavigateAwayHandler.tsx 67.94% <25.00%> (-0.89%) ⬇️
src/libs/actions/Delegate.ts 31.14% <21.21%> (+0.87%) ⬆️
... and 15 files with indirect coverage changes

@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@melvin-bot

melvin-bot Bot commented Jun 23, 2026

Copy link
Copy Markdown

@abdulrahuman5196 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 flaviadefaria and removed request for a team June 23, 2026 15:53

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

Copy link
Copy Markdown

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: 0e47244173

ℹ️ 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/actions/Delegate.ts Outdated
@mountiny
mountiny self-requested a review June 23, 2026 16:01
@abdulrahuman5196

Copy link
Copy Markdown
Contributor

checking now

@abdulrahuman5196

Copy link
Copy Markdown
Contributor

checking now again

@abdulrahuman5196

Copy link
Copy Markdown
Contributor

IMO. Code looks good.

@abdulrahuman5196

Copy link
Copy Markdown
Contributor

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

@mountiny Could you kindly re-add this since we have new changes?

tgolen
tgolen previously approved these changes Jul 6, 2026
encryptedAuthToken,
creationDate,
})
.then(() => {

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.

Ah, I see. OK, if it was just moved and not modified, I'm OK with doing it in another PR and issue. We should get the original author(s) involved in it.

mountiny
mountiny previously approved these changes Jul 6, 2026
@war-in
war-in dismissed stale reviews from mountiny and tgolen via 9a614bc July 6, 2026 16:40
luacmartins
luacmartins previously approved these changes Jul 6, 2026
@mountiny mountiny changed the title fix: restore main session when authToken expires while in copilot mode [HOLD https://github.com/Expensify/Mobile-Expensify/pull/13973 ready for merge] fix: restore main session when authToken expires while in copilot mode Jul 6, 2026
luacmartins
luacmartins previously approved these changes Jul 7, 2026
@mountiny

Copy link
Copy Markdown
Contributor

Running actions on https://github.com/Expensify/Mobile-Expensify/pull/13973 - if green we can merge this

@mountiny mountiny changed the title [HOLD https://github.com/Expensify/Mobile-Expensify/pull/13973 ready for merge] fix: restore main session when authToken expires while in copilot mode fix: restore main session when authToken expires while in copilot mode Jul 13, 2026

@mountiny mountiny left a comment

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.

The OldApp PR is ready to be merged so we can merge these both now, thanks for your patience

@mountiny
mountiny merged commit 8d6e2c1 into Expensify:main Jul 13, 2026
36 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.34-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR and no help site changes are required under docs/articles.

Why: This is an internal session-management bug fix. When a copilot's (delegate's) authToken expires, the app now restores the user to their own account instead of getting stuck, signed out, or left on the delegated account. The changes are confined to reauth/session-restoration logic (Reauthentication.ts, Delegate.ts, Session/index.ts, updateSessionUser.ts, ReportNavigateAwayHandler.tsx) — there are no new features, UI elements, settings, labels, buttons, or changes to any documented user workflow.

The existing Copilot help articles (Act as a Copilot, Manage Copilot Access) document how to switch into, act within, and exit a Copilot account. They do not document error-recovery behavior when an auth/session token expires, and nothing in them becomes inaccurate as a result of this fix. This change restores expected behavior rather than introducing anything that needs to be documented.

Since no documentation updates are needed, I did not create a draft PR.

war-in, if you believe a specific behavior here should be documented (e.g., what a copilot sees when their session expires), let me know and I'll draft the help site changes.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

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.

9 participants