Skip to content

Fix duplicate SignInWithSupportAuthToken call during support login#91200

Draft
MelvinBot wants to merge 6 commits into
mainfrom
claude-fixDuplicateSupportAuthTokenCall
Draft

Fix duplicate SignInWithSupportAuthToken call during support login#91200
MelvinBot wants to merge 6 commits into
mainfrom
claude-fixDuplicateSupportAuthTokenCall

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented May 20, 2026 •
edited by danieldoglas
Loading

Explanation of Change

signInWithSupportAuthToken was missing a NetworkStore.setLastShortAuthToken(authToken) call that signInWithShortLivedAuthToken already has. Without it, the dedup guard in LogInWithShortLivedAuthTokenPage (token === getLastShortAuthToken()) never matches for support tokens, so both LogInWithShortLivedAuthTokenPage (PublicScreens) and LogOutPreviousUserPage (AuthScreens) independently fire signInWithSupportAuthToken, making 2 calls instead of one.

This one-line addition matches the existing pattern in signInWithShortLivedAuthToken and makes the dedup guard effective for support tokens.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/383021

Tests

// TODO: The human co-author must fill out the tests you ran before marking this PR as "ready for review"
// Please describe what tests you performed that validates your changed worked.

  • Verify that no errors appear in the JS console

Offline tests

N/A - this change only affects the support login transition flow which requires network connectivity.

QA Steps

// TODO: The human co-author must fill out the QA tests you ran before marking this PR as "ready for review".

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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@MelvinBot @danieldoglas
Fix duplicate SignInWithSupportAuthToken call from NewDot
615dffc 
Add setLastShortAuthToken call to signInWithSupportAuthToken to prevent
the dedup guard in LogInWithShortLivedAuthTokenPage from being bypassed.
Without this, both LogInWithShortLivedAuthTokenPage and
LogOutPreviousUserPage fire signInWithSupportAuthToken independently,
causing a 4th Auth call that triggers the 3/30s throttle.

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team May 20, 2026 14:24
@codecov
Copy link
Copy Markdown

codecov Bot commented May 20, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/actions/Session/index.ts 44.07% <100.00%> (+1.22%) ⬆️
... and 84 files with indirect coverage changes

@danieldoglas
Copy link
Copy Markdown
Contributor

danieldoglas commented May 20, 2026

@MelvinBot add unit tests for this.

@MelvinBot @danieldoglas
Add unit tests for signInWithSupportAuthToken
d2a3f88 
Verify that signInWithSupportAuthToken stores the auth token via
NetworkStore.setLastShortAuthToken (for the dedup guard) and makes
the correct API call.

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 20, 2026

Added two unit tests for signInWithSupportAuthToken in tests/actions/SessionTest.ts:

  1. Verifies that the auth token is stored via NetworkStore.setLastShortAuthToken (the dedup guard fix)
  2. Verifies the correct SignInWithSupportAuthToken API call is made

All 31 tests in the suite pass.

@MelvinBot @danieldoglas
Fix spellcheck: replace 'dedup' with 'duplicate call' in test descrip…
95a367a 
…tion

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 20, 2026

Fixed the failing spellcheck: replaced the word dedup with duplicate call in the test description at tests/actions/SessionTest.ts:615.

@MelvinBot @danieldoglas
Fix ESLint errors: add disable comments for no-multiple-api-calls and…
357acc2 
… no-unsafe-assignment

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 20, 2026

Fixed the failing ESLint check: added eslint-disable-next-line comments for rulesdir/no-multiple-api-calls and @typescript-eslint/no-unsafe-assignment in the new test, matching the existing pattern used elsewhere in SessionTest.ts.

danieldoglas
danieldoglas reviewed May 20, 2026
View reviewed changes
Comment thread tests/actions/SessionTest.ts Outdated
Comment on lines +623 to +635
test('should make the SignInWithSupportAuthToken API call', () => {
// eslint-disable-next-line rulesdir/no-multiple-api-calls
const readSpy = jest.spyOn(API, 'read');
const testToken = 'supportAuthToken456';

SessionUtil.signInWithSupportAuthToken(testToken);

// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
expect(readSpy).toHaveBeenCalledWith('SignInWithSupportAuthToken', {authToken: testToken}, expect.objectContaining({optimisticData: expect.any(Array)}));

readSpy.mockRestore();
});
});
Copy link
Copy Markdown
Contributor

@danieldoglas danieldoglas May 20, 2026

Choose a reason for hiding this comment

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

@MelvinBot this is not a good test for our initial problem. Maybe this should be an UI test that tests the navigations between the two pages?

Copy link
Copy Markdown
Contributor Author

@MelvinBot MelvinBot May 20, 2026

Choose a reason for hiding this comment

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

Good point! Replaced the unit tests with a UI test in tests/ui/SessionTest.tsx that renders the full <App /> with a support auth token deep link and verifies signInWithSupportAuthToken is called exactly once during the LogInWithShortLivedAuthTokenPage → LogOutPreviousUserPage navigation transition. This directly tests the dedup guard in the real navigation flow.

@MelvinBot @danieldoglas
Replace unit tests with UI navigation test for support auth token ded…
f38c373 
…up guard

Remove the simple unit tests that only checked setLastShortAuthToken is called,
and add a UI test that renders the full App with a support auth token deep link
to verify signInWithSupportAuthToken is called exactly once during the
LogInWithShortLivedAuthTokenPage → LogOutPreviousUserPage navigation flow.

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 20, 2026

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

1 similar comment
@MelvinBot
Copy link
Copy Markdown
Contributor Author

MelvinBot commented May 20, 2026

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

danieldoglas
danieldoglas reviewed May 20, 2026
View reviewed changes
Comment thread tests/ui/SessionTest.tsx Outdated
});

it('should not call signInWithSupportAuthToken twice when navigating from LogInWithShortLivedAuthTokenPage to LogOutPreviousUserPage', async () => {
expect(hasAuthToken()).toBe(false);
Copy link
Copy Markdown
Contributor

@danieldoglas danieldoglas May 20, 2026

Choose a reason for hiding this comment

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

@MelvinBot there needs to be a logged user for this flow to call the api twice.

Copy link
Copy Markdown
Contributor Author

@MelvinBot MelvinBot May 20, 2026

Choose a reason for hiding this comment

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

Good catch! Updated the test to first sign in a user (so the app starts on AuthScreens), unmount, then set the support auth token deep link and remount. This way both LogOutPreviousUserPage (AuthScreens) and LogInWithShortLivedAuthTokenPage (PublicScreens) are exercised, matching the real bug scenario. The test verifies signInWithSupportAuthToken is still only called once thanks to the dedup guard.

@MelvinBot @danieldoglas
Fix support auth token UI test to sign in a user first
921caad 
The bug requires a logged-in user for both LogInWithShortLivedAuthTokenPage
and LogOutPreviousUserPage to fire. Updated the test to sign in a user,
unmount, set the support deep link, then remount - matching the real bug
scenario. Also fixed mock recursion by restoring all mocks before re-spying.

Co-authored-by: Daniel Silva <danieldoglas@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@danieldoglas danieldoglas danieldoglas left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@danieldoglas danieldoglas

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MelvinBot @danieldoglas