wood/aimodels-prices
1
0
Fork 0
mirror of https://github.com/woodchen-ink/aimodels-prices.git synced 2025-07-19 06:01:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化OAuth认证处理逻辑并增加调试日志

Browse Source 
- 固定OAuth授权、令牌和用户信息URL
- 更新用户信息结构体以匹配新的API响应
- 添加调试日志输出用户信息和角色分配
- 修正用户ID类型为整型
- 优化管理员角色判断逻辑
This commit is contained in:
wood chen 2025-03-03 23:33:15 +08:00
parent af82111ae3
commit e7e93dc2ad
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend/handlers/auth.go
View File

@ -59,9 +59,9 @@ func Login(c *gin.Context) {
// 生产环境使用 OAuth 2.0 // 生产环境使用 OAuth 2.0
clientID := os.Getenv("OAUTH_CLIENT_ID") clientID := os.Getenv("OAUTH_CLIENT_ID")
redirectURI := os.Getenv("OAUTH_REDIRECT_URI") redirectURI := os.Getenv("OAUTH_REDIRECT_URI")
authorizeURL := os.Getenv("OAUTH_AUTHORIZE_URL") authorizeURL := "https://connect.czl.net/oauth2/authorize" // 固定授权URL
if clientID == "" || redirectURI == "" || authorizeURL == "" { if clientID == "" || redirectURI == "" {
c.JSON(http.StatusInternalServerError, gin.H{"error": "OAuth configuration not found"}) c.JSON(http.StatusInternalServerError, gin.H{"error": "OAuth configuration not found"})
return return
} }
@ -123,7 +123,7 @@ func AuthCallback(c *gin.Context) {
} }
// 获取访问令牌 // 获取访问令牌
tokenURL := os.Getenv("OAUTH_TOKEN_URL") tokenURL := "https://connect.czl.net/api/oauth2/token" // 固定令牌URL
clientID := os.Getenv("OAUTH_CLIENT_ID") clientID := os.Getenv("OAUTH_CLIENT_ID")
clientSecret := os.Getenv("OAUTH_CLIENT_SECRET") clientSecret := os.Getenv("OAUTH_CLIENT_SECRET")
redirectURI := os.Getenv("OAUTH_REDIRECT_URI") redirectURI := os.Getenv("OAUTH_REDIRECT_URI")
@ -156,7 +156,7 @@ func AuthCallback(c *gin.Context) {
} }
// 使用访问令牌获取用户信息 // 使用访问令牌获取用户信息
userURL := os.Getenv("OAUTH_USER_URL") userURL := "https://connect.czl.net/api/oauth2/userinfo" // 固定用户信息URL
req, err := http.NewRequest("GET", userURL, nil) req, err := http.NewRequest("GET", userURL, nil)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user info request"}) c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create user info request"})
@ -173,11 +173,23 @@ func AuthCallback(c *gin.Context) {
defer userResp.Body.Close() defer userResp.Body.Close()
var userInfo struct { var userInfo struct {
ID string `json:"id"` ID int `json:"id"`
Email string `json:"email"` Email string `json:"email"`
Username string `json:"username"` Username string `json:"username"`
AvatarURL string `json:"avata"` Avatar string `json:"avatar"`
Name string `json:"name"` Name string `json:"name"`
Upstreams []struct {
ID int `json:"id"`
UpstreamID int `json:"upstream_id"`
UpstreamName string `json:"upstream_name"`
UpstreamType string `json:"upstream_type"`
UpstreamIcon string `json:"upstream_icon"`
UpstreamUserID string `json:"upstream_user_id"`
UpstreamUsername string `json:"upstream_username"`
UpstreamEmail string `json:"upstream_email"`
UpstreamAvatar string `json:"upstream_avatar"`
ProviderData map[string]interface{} `json:"provider_data"`
} `json:"upstreams"`
} }
if err := json.NewDecoder(userResp.Body).Decode(&userInfo); err != nil { if err := json.NewDecoder(userResp.Body).Decode(&userInfo); err != nil {
@ -185,6 +197,9 @@ func AuthCallback(c *gin.Context) {
return return
} }
// 添加调试日志
fmt.Printf("收到OAuth用户信息: ID=%v, Username=%s, Email=%s\n", userInfo.ID, userInfo.Username, userInfo.Email)
db := c.MustGet("db").(*sql.DB) db := c.MustGet("db").(*sql.DB)
// 检查用户是否存在 // 检查用户是否存在
@ -193,8 +208,11 @@ func AuthCallback(c *gin.Context) {
&user.ID, &user.Username, &user.Email, &user.Role) &user.ID, &user.Username, &user.Email, &user.Role)
role := "user" role := "user"
if userInfo.ID == "1" { // 这里写自己的用户ID if userInfo.ID == 1 { // 这里写自己的用户ID
role = "admin" role = "admin"
fmt.Printf("为用户 %s (ID=%v) 设置管理员角色\n", userInfo.Username, userInfo.ID)
} else {
fmt.Printf("用户 %s (ID=%v) 不是管理员\n", userInfo.Username, userInfo.ID)
} }
if err == sql.ErrNoRows { if err == sql.ErrNoRows {