This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Fix issue in SAMS account disambiguation#62738
Merged
chrsmith merged 2 commits intoMay 16, 2024
Merged
Conversation
unknwon
approved these changes
May 16, 2024
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
There was a minor error in the the logic we use to disambiguate fetching the Cody Pro subscription for a Sourcegraph user with multiple SAMS identities.
The SSC backend assigns a Cody Pro subscription to a SAMS user account. However, a single Sourcegraph.com user account can have multiple SAMS identities. This leads to problems...
So as a workaround until we can fix https://github.com/sourcegraph/sourcegraph/issues/60912 more generally (e.g. remove all instances where a dotcom user has multiple SAMS accounts), we have some logic to "pick the right Cody Pro subscription". (e.g. if a user has 2x canceled Cody Pro subscriptions, but one that is active. Select the active one.)
The problem we have in the code is that we should consider the subscription status of
trialingas being one of the good ones. (In addition toactiveandpast_due.) If a user is on a free trial of the product, they will have access to Cody Pro. So we should "pick that one" instead of falling back to whatever Cody Pro subscription is tied to the user's "first" SAMS account.Test plan
Relying on CI/CD.