Skip to content

fix(auth): Pin SSO setup identity link to the authenticated session#113720

Merged
michelletran-sentry merged 1 commit intomasterfrom
fix/sso-identity-linking
Apr 22, 2026
Merged

fix(auth): Pin SSO setup identity link to the authenticated session#113720
michelletran-sentry merged 1 commit intomasterfrom
fix/sso-identity-linking

Conversation

@michelletran-sentry
Copy link
Copy Markdown
Contributor

During SSO provider setup, override the IdP assertion email with the authenticated user's email so that resolve_email_to_user consistently returns the admin performing setup.

Legal Boilerplate

Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.

During SSO provider setup, override the IdP assertion email with the
authenticated user's email so that resolve_email_to_user consistently
returns the admin performing setup.

Co-Authored-By: Claude <noreply@anthropic.com>
@michelletran-sentry michelletran-sentry requested a review from a team as a code owner April 22, 2026 18:56
@github-actions github-actions Bot added the Scope: Backend Automatically applied to PRs that change backend components label Apr 22, 2026
@michelletran-sentry michelletran-sentry enabled auto-merge (squash) April 22, 2026 18:58
Comment thread src/sentry/auth/helper.py
@michelletran-sentry michelletran-sentry merged commit 0c67558 into master Apr 22, 2026
57 checks passed
@michelletran-sentry michelletran-sentry deleted the fix/sso-identity-linking branch April 22, 2026 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Scope: Backend Automatically applied to PRs that change backend components

2 participants