Skip to content

ref: change order openid token generation #90697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ref: change order openid token generation #90697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/sentry/web/frontend/oauth_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,26 @@ def get_access_tokens(self, request: Request, application: ApiApplication) -> di
return {"error": "invalid_grant", "reason": "invalid redirect URI"}

try:
token_data = {"token": ApiToken.from_grant(grant=grant)}
id_token = None
if grant.has_scope("openid") and options.get("codecov.signing_secret"):
open_id_token = OpenIDToken(
request.POST.get("client_id"),
grant.user_id,
options.get("codecov.signing_secret"),
nonce=request.POST.get("nonce"),
)
id_token = open_id_token.get_signed_id_token(grant=grant)

token = ApiToken.from_grant(grant=grant)
token_data = {"token": token}

if id_token:
token_data["id_token"] = id_token

except UnableToAcquireLock:
# TODO(mdtro): we should return a 409 status code here
return {"error": "invalid_grant", "reason": "invalid grant"}

if grant.has_scope("openid") and options.get("codecov.signing_secret"):
open_id_token = OpenIDToken(
request.POST.get("client_id"),
grant.user_id,
options.get("codecov.signing_secret"),
nonce=request.POST.get("nonce"),
)
token_data["id_token"] = open_id_token.get_signed_id_token(grant=grant)

return token_data

def get_refresh_token(self, request: Request, application: ApiApplication) -> dict:
Expand Down
Loading