fix: trigger access token refresh - #7149
Merged
Merged
Conversation
There was a problem hiding this comment.
Bug: Double Refresh Triggers Unnecessary Sign-Out.
triggerAccessTokenRefresh() is called twice in submitShieldSubscriptionCryptoApproval(): once by startSubscriptionWithCrypto() at line 477, and again by getSubscriptions() at line 393 when it detects the subscription state change. This causes redundant performSignOut calls to the AuthenticationController.
packages/subscription-controller/src/SubscriptionController.ts#L530-L533
core/packages/subscription-controller/src/SubscriptionController.ts
Lines 530 to 533 in d305b7e
lwin-kyaw
previously approved these changes
Nov 13, 2025
lwin-kyaw
approved these changes
Nov 13, 2025
chaitanyapotti
approved these changes
Nov 13, 2025
chaitanyapotti
enabled auto-merge (squash)
November 13, 2025 13:20
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation
triggerAccessTokenRefreshwas only called duringgetSubscriptionspolling, normal subscription state change didn't trigger it.This PR trigger
triggerAccessTokenRefresheverytime subscription state changetriggerAccessTokenRefreshfromstartShieldSubscriptionWithCardsince that only return stripe checkout url, not subscribed yet.References
Checklist
Note
Refresh access token immediately when subscription state changes and remove redundant refresh triggers in start subscription flows, simplifying poll logic.
src/SubscriptionController.ts):triggerAccessTokenRefresh()immediately whengetSubscriptionsupdates state; remove deferred flag and poll-based refresh path.triggerAccessTokenRefresh()afterstartShieldSubscriptionWithCardandstartSubscriptionWithCrypto(checkout/creation only), with clarifying comments._executePollnow only callsgetSubscriptions.[Unreleased].Written by Cursor Bugbot for commit bc4213d. This will update automatically on new commits. Configure here.