From 50d9dbf3a55dcd8c48c487d7aaaeb89c48a8edaa Mon Sep 17 00:00:00 2001 From: afjcjsbx Date: Mon, 23 Mar 2026 20:44:57 +0100 Subject: [PATCH] simplified duplicated code --- pkg/auth/oauth.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkg/auth/oauth.go b/pkg/auth/oauth.go index 4667e3d81..2bf719dd4 100644 --- a/pkg/auth/oauth.go +++ b/pkg/auth/oauth.go @@ -545,13 +545,11 @@ func parseTokenResponse(body []byte, provider string) (*AuthCredential, error) { AuthMethod: "oauth", } - if accountID := extractAccountID(tokenResp.IDToken); accountID != "" { - cred.AccountID = accountID - } else if accountID := extractAccountID(tokenResp.AccessToken); accountID != "" { - cred.AccountID = accountID - } else if accountID := extractAccountID(tokenResp.IDToken); accountID != "" { - // Recent OpenAI OAuth responses may only include chatgpt_account_id in id_token claims. - cred.AccountID = accountID + // Recent OpenAI OAuth responses may only include chatgpt_account_id in id_token claims. + if id := extractAccountID(tokenResp.IDToken); id != "" { + cred.AccountID = id + } else if id := extractAccountID(tokenResp.AccessToken); id != "" { + cred.AccountID = id } return cred, nil