mirror of
https://gitee.com/wanwujie/sub2api
synced 2026-04-03 06:52:13 +08:00
1fc9dd7b68
Introduce OAuthRefreshAPI as the single entry point for all OAuth token refresh operations, eliminating the race condition where background refresh and inline refresh could simultaneously use the same refresh_token (fixes #1035). Key changes: - Add OAuthRefreshExecutor interface extending TokenRefresher with CacheKey - Add OAuthRefreshAPI.RefreshIfNeeded with lock → DB re-read → double-check flow - Add ProviderRefreshPolicy / BackgroundRefreshPolicy strategy types - Simplify all 4 TokenProviders to delegate to OAuthRefreshAPI - Rewrite TokenRefreshService.refreshWithRetry to use unified API path - Add MergeCredentials and BuildClaudeAccountCredentials helpers - Add 40 unit tests covering all new and modified code paths
47 lines
1.3 KiB
Go
47 lines
1.3 KiB
Go
package service
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
)
|
|
|
|
type GeminiTokenRefresher struct {
|
|
geminiOAuthService *GeminiOAuthService
|
|
}
|
|
|
|
func NewGeminiTokenRefresher(geminiOAuthService *GeminiOAuthService) *GeminiTokenRefresher {
|
|
return &GeminiTokenRefresher{geminiOAuthService: geminiOAuthService}
|
|
}
|
|
|
|
// CacheKey 返回用于分布式锁的缓存键
|
|
func (r *GeminiTokenRefresher) CacheKey(account *Account) string {
|
|
return GeminiTokenCacheKey(account)
|
|
}
|
|
|
|
func (r *GeminiTokenRefresher) CanRefresh(account *Account) bool {
|
|
return account.Platform == PlatformGemini && account.Type == AccountTypeOAuth
|
|
}
|
|
|
|
func (r *GeminiTokenRefresher) NeedsRefresh(account *Account, refreshWindow time.Duration) bool {
|
|
if !r.CanRefresh(account) {
|
|
return false
|
|
}
|
|
expiresAt := account.GetCredentialAsTime("expires_at")
|
|
if expiresAt == nil {
|
|
return false
|
|
}
|
|
return time.Until(*expiresAt) < refreshWindow
|
|
}
|
|
|
|
func (r *GeminiTokenRefresher) Refresh(ctx context.Context, account *Account) (map[string]any, error) {
|
|
tokenInfo, err := r.geminiOAuthService.RefreshAccountToken(ctx, account)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
newCredentials := r.geminiOAuthService.BuildAccountCredentials(tokenInfo)
|
|
newCredentials = MergeCredentials(account.Credentials, newCredentials)
|
|
|
|
return newCredentials, nil
|
|
}
|