Merge pull request #3195 from jianjianai/fix/invalid-refresh-token-nonretryable

fix: treat invalid_refresh_token as non-retryable / 将 invalid_refresh_token 判定为不可重试
This commit is contained in:
Wesley Liddick
2026-06-16 11:12:45 +08:00
committed by GitHub
2 changed files with 10 additions and 6 deletions
@@ -440,12 +440,14 @@ func isNonRetryableRefreshError(err error) bool {
}
msg := strings.ToLower(err.Error())
nonRetryable := []string{
"invalid_grant", // refresh_token 已失效
"refresh_token_reused", // OpenAI refresh_token 已被使用,必须重新授权
"invalid_client", // 客户端配置错误
"unauthorized_client", // 客户端未授权
"access_denied", // 访问被拒绝
"missing_project_id", // 缺少 project_id
"invalid_grant", // refresh_token 已失效
"invalid_refresh_token", // refresh_token 无效, team 账号工作区被删除会出现
"app_session_terminated", // refresh_token team 账号工作区被删除
"refresh_token_reused", // OpenAI refresh_token 已被使用,必须重新授权
"invalid_client", // 客户端配置错误
"unauthorized_client", // 客户端未授权
"access_denied", // 访问被拒绝
"missing_project_id", // 缺少 project_id
"no refresh token available",
}
for _, needle := range nonRetryable {
@@ -532,7 +532,9 @@ func TestIsNonRetryableRefreshError(t *testing.T) {
{name: "network_error", err: errors.New("network timeout"), expected: false},
{name: "invalid_grant", err: errors.New("invalid_grant"), expected: true},
{name: "invalid_client", err: errors.New("invalid_client"), expected: true},
{name: "invalid_refresh_token", err: errors.New(`OPENAI_OAUTH_TOKEN_REFRESH_FAILED: token refresh failed: status 401, body: {"error":{"code":"invalid_refresh_token"}}`), expected: true},
{name: "refresh_token_reused", err: errors.New(`OPENAI_OAUTH_TOKEN_REFRESH_FAILED: token refresh failed: status 401, body: {"error":{"code":"refresh_token_reused"}}`), expected: true},
{name: "app_session_terminated", err: errors.New(`OPENAI_OAUTH_TOKEN_REFRESH_FAILED: token refresh failed: status 401, body: {"error": {"code": "app_session_terminated"}}`), expected: true},
{name: "unauthorized_client", err: errors.New("unauthorized_client"), expected: true},
{name: "access_denied", err: errors.New("access_denied"), expected: true},
{name: "no_refresh_token", err: errors.New("no refresh token available"), expected: true},