主要改动: - 后端:重构 Gemini 配额服务,支持多层级配额策略(GCP Standard/Free, Google One, AI Studio, Code Assist) - 后端:优化 OAuth 服务,增强 tier_id 识别和存储逻辑 - 后端:改进用量统计服务,支持不同平台的配额查询 - 后端:优化限流服务,增加临时解除调度状态管理 - 前端:统一四种授权方式的用量显示格式和徽标样式 - 前端:增强账户配额信息展示,支持多种配额类型 - 前端:改进创建和重新授权模态框的用户体验 - 国际化:完善中英文配额相关文案 - 移除 CHANGELOG.md 文件 测试:所有单元测试通过
142 lines
4.7 KiB
Go
142 lines
4.7 KiB
Go
package admin
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type GeminiOAuthHandler struct {
|
|
geminiOAuthService *service.GeminiOAuthService
|
|
}
|
|
|
|
func NewGeminiOAuthHandler(geminiOAuthService *service.GeminiOAuthService) *GeminiOAuthHandler {
|
|
return &GeminiOAuthHandler{geminiOAuthService: geminiOAuthService}
|
|
}
|
|
|
|
// GET /api/v1/admin/gemini/oauth/capabilities
|
|
func (h *GeminiOAuthHandler) GetCapabilities(c *gin.Context) {
|
|
cfg := h.geminiOAuthService.GetOAuthConfig()
|
|
response.Success(c, cfg)
|
|
}
|
|
|
|
type GeminiGenerateAuthURLRequest struct {
|
|
ProxyID *int64 `json:"proxy_id"`
|
|
ProjectID string `json:"project_id"`
|
|
// OAuth 类型: "code_assist" (需要 project_id) 或 "ai_studio" (不需要 project_id)
|
|
// 默认为 "code_assist" 以保持向后兼容
|
|
OAuthType string `json:"oauth_type"`
|
|
// TierID is a user-selected tier to be used when auto detection is unavailable or fails.
|
|
TierID string `json:"tier_id"`
|
|
}
|
|
|
|
// GenerateAuthURL generates Google OAuth authorization URL for Gemini.
|
|
// POST /api/v1/admin/gemini/oauth/auth-url
|
|
func (h *GeminiOAuthHandler) GenerateAuthURL(c *gin.Context) {
|
|
var req GeminiGenerateAuthURLRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
response.BadRequest(c, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
|
|
// 默认使用 code_assist 以保持向后兼容
|
|
oauthType := strings.TrimSpace(req.OAuthType)
|
|
if oauthType == "" {
|
|
oauthType = "code_assist"
|
|
}
|
|
if oauthType != "code_assist" && oauthType != "google_one" && oauthType != "ai_studio" {
|
|
response.BadRequest(c, "Invalid oauth_type: must be 'code_assist', 'google_one', or 'ai_studio'")
|
|
return
|
|
}
|
|
|
|
// Always pass the "hosted" callback URI; the OAuth service may override it depending on
|
|
// oauth_type and whether the built-in Gemini CLI OAuth client is used.
|
|
redirectURI := deriveGeminiRedirectURI(c)
|
|
result, err := h.geminiOAuthService.GenerateAuthURL(c.Request.Context(), req.ProxyID, redirectURI, req.ProjectID, oauthType, req.TierID)
|
|
if err != nil {
|
|
msg := err.Error()
|
|
// Treat missing/invalid OAuth client configuration as a user/config error.
|
|
if strings.Contains(msg, "OAuth client not configured") || strings.Contains(msg, "requires your own OAuth Client") {
|
|
response.BadRequest(c, "Failed to generate auth URL: "+msg)
|
|
return
|
|
}
|
|
response.InternalError(c, "Failed to generate auth URL: "+msg)
|
|
return
|
|
}
|
|
|
|
response.Success(c, result)
|
|
}
|
|
|
|
type GeminiExchangeCodeRequest struct {
|
|
SessionID string `json:"session_id" binding:"required"`
|
|
State string `json:"state" binding:"required"`
|
|
Code string `json:"code" binding:"required"`
|
|
ProxyID *int64 `json:"proxy_id"`
|
|
// OAuth 类型: "code_assist" 或 "ai_studio",需要与 GenerateAuthURL 时的类型一致
|
|
OAuthType string `json:"oauth_type"`
|
|
// TierID is a user-selected tier to be used when auto detection is unavailable or fails.
|
|
// This field is optional; when omitted, the server uses the tier stored in the OAuth session.
|
|
TierID string `json:"tier_id"`
|
|
}
|
|
|
|
// ExchangeCode exchanges authorization code for tokens.
|
|
// POST /api/v1/admin/gemini/oauth/exchange-code
|
|
func (h *GeminiOAuthHandler) ExchangeCode(c *gin.Context) {
|
|
var req GeminiExchangeCodeRequest
|
|
if err := c.ShouldBindJSON(&req); err != nil {
|
|
response.BadRequest(c, "Invalid request: "+err.Error())
|
|
return
|
|
}
|
|
|
|
// 默认使用 code_assist 以保持向后兼容
|
|
oauthType := strings.TrimSpace(req.OAuthType)
|
|
if oauthType == "" {
|
|
oauthType = "code_assist"
|
|
}
|
|
if oauthType != "code_assist" && oauthType != "google_one" && oauthType != "ai_studio" {
|
|
response.BadRequest(c, "Invalid oauth_type: must be 'code_assist', 'google_one', or 'ai_studio'")
|
|
return
|
|
}
|
|
|
|
tokenInfo, err := h.geminiOAuthService.ExchangeCode(c.Request.Context(), &service.GeminiExchangeCodeInput{
|
|
SessionID: req.SessionID,
|
|
State: req.State,
|
|
Code: req.Code,
|
|
ProxyID: req.ProxyID,
|
|
OAuthType: oauthType,
|
|
TierID: req.TierID,
|
|
})
|
|
if err != nil {
|
|
response.BadRequest(c, "Failed to exchange code: "+err.Error())
|
|
return
|
|
}
|
|
|
|
response.Success(c, tokenInfo)
|
|
}
|
|
|
|
func deriveGeminiRedirectURI(c *gin.Context) string {
|
|
origin := strings.TrimSpace(c.GetHeader("Origin"))
|
|
if origin != "" {
|
|
return strings.TrimRight(origin, "/") + "/auth/callback"
|
|
}
|
|
|
|
scheme := "http"
|
|
if c.Request.TLS != nil {
|
|
scheme = "https"
|
|
}
|
|
if xfProto := strings.TrimSpace(c.GetHeader("X-Forwarded-Proto")); xfProto != "" {
|
|
scheme = strings.TrimSpace(strings.Split(xfProto, ",")[0])
|
|
}
|
|
|
|
host := strings.TrimSpace(c.Request.Host)
|
|
if xfHost := strings.TrimSpace(c.GetHeader("X-Forwarded-Host")); xfHost != "" {
|
|
host = strings.TrimSpace(strings.Split(xfHost, ",")[0])
|
|
}
|
|
|
|
return fmt.Sprintf("%s://%s/auth/callback", scheme, host)
|
|
}
|