fix(preprod): Restore full token authentication on retention endpoint#109842
Merged
NicoHinderling merged 1 commit intomasterfrom Mar 3, 2026
Merged
fix(preprod): Restore full token authentication on retention endpoint#109842NicoHinderling merged 1 commit intomasterfrom
NicoHinderling merged 1 commit intomasterfrom
Conversation
Add OrgAuthTokenAuthentication and reorder authentication_classes so token classes come before SessionAuthentication. Previously, session auth could win over token auth when both cookies and a Bearer token were present, causing spurious 401 sso-required errors. Co-Authored-By: Claude <noreply@anthropic.com>
rbro112
approved these changes
Mar 3, 2026
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.
Making sure we can hit the retention endpoint from CLI
https://linear.app/getsentry/issue/EME-855/wire-up-snapshots-retention-in-retention-api
Add
OrgAuthTokenAuthenticationand reorderauthentication_classesonOrganizationPreprodRetentionEndpointso token classes come beforeSessionAuthentication.Previously,
SessionAuthenticationwas listed beforeUserAuthTokenAuthentication.When a request carried both session cookies and a Bearer token (e.g. from a browser
with an active Sentry session), session auth would win, set
request.auth = None,and trigger the SSO check — returning a spurious
401 sso-requirederror. Tokenauth never got a chance to run.
The fix matches the ordering used by
DEFAULT_AUTHENTICATIONinsrc/sentry/api/base.py:token classes first, session auth last as a fallback.