优化小程序登录流程,增加用户协议和隐私政策的勾选机制,确保用户主动同意后方可登录,符合审核要求。同时,增强错误处理逻辑,提升用户体验和系统稳定性。新增用户协议和隐私政策页面,更新相关样式以改善界面交互。
This commit is contained in:
68
soul-api/internal/auth/adminjwt.go
Normal file
68
soul-api/internal/auth/adminjwt.go
Normal file
@@ -0,0 +1,68 @@
|
||||
// Package auth 管理端 JWT:签发与校验,使用 Authorization: Bearer <token>
|
||||
package auth
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/golang-jwt/jwt/v5"
|
||||
)
|
||||
|
||||
const adminJWTExpire = 7 * 24 * time.Hour // 7 天
|
||||
|
||||
// AdminClaims 管理端 JWT 载荷
|
||||
type AdminClaims struct {
|
||||
jwt.RegisteredClaims
|
||||
Username string `json:"username"`
|
||||
Role string `json:"role"`
|
||||
}
|
||||
|
||||
// IssueAdminJWT 签发管理端 JWT,使用 ADMIN_SESSION_SECRET 签名
|
||||
func IssueAdminJWT(secret, username string) (string, error) {
|
||||
now := time.Now()
|
||||
claims := AdminClaims{
|
||||
RegisteredClaims: jwt.RegisteredClaims{
|
||||
ExpiresAt: jwt.NewNumericDate(now.Add(adminJWTExpire)),
|
||||
IssuedAt: jwt.NewNumericDate(now),
|
||||
Subject: "admin",
|
||||
},
|
||||
Username: username,
|
||||
Role: "admin",
|
||||
}
|
||||
tok := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
|
||||
return tok.SignedString([]byte(secret))
|
||||
}
|
||||
|
||||
// ParseAdminJWT 校验并解析 JWT,返回 claims;无效或过期返回 nil, false
|
||||
func ParseAdminJWT(tokenString, secret string) (*AdminClaims, bool) {
|
||||
if tokenString == "" || secret == "" {
|
||||
return nil, false
|
||||
}
|
||||
tok, err := jwt.ParseWithClaims(tokenString, &AdminClaims{}, func(t *jwt.Token) (interface{}, error) {
|
||||
return []byte(secret), nil
|
||||
}, jwt.WithValidMethods([]string{"HS256"}))
|
||||
if err != nil || !tok.Valid {
|
||||
return nil, false
|
||||
}
|
||||
claims, ok := tok.Claims.(*AdminClaims)
|
||||
if !ok || claims.Username == "" {
|
||||
return nil, false
|
||||
}
|
||||
return claims, true
|
||||
}
|
||||
|
||||
// GetAdminJWTFromRequest 从请求中读取 JWT:优先 Authorization: Bearer <token>,其次 Cookie admin_session(兼容旧端)
|
||||
func GetAdminJWTFromRequest(r *http.Request) string {
|
||||
// 1. Authorization: Bearer <token>
|
||||
ah := r.Header.Get("Authorization")
|
||||
if strings.HasPrefix(ah, "Bearer ") {
|
||||
return strings.TrimSpace(ah[7:])
|
||||
}
|
||||
// 2. Cookie(兼容:若值为 JWT 格式则可用)
|
||||
c, err := r.Cookie(adminCookieName)
|
||||
if err != nil || c == nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(c.Value)
|
||||
}
|
||||
@@ -53,6 +53,14 @@ func AdminCookieName() string { return adminCookieName }
|
||||
// MaxAgeSec 返回 session 有效秒数
|
||||
func MaxAgeSec() int { return maxAgeSec }
|
||||
|
||||
// SetCookieHeaderValue 返回完整的 Set-Cookie 头内容(含 SameSite=None; Secure,供跨站时携带 Cookie)
|
||||
func SetCookieHeaderValue(token string, maxAge int) string {
|
||||
if maxAge <= 0 {
|
||||
return adminCookieName + "=; Path=/; Max-Age=0; HttpOnly; SameSite=None; Secure"
|
||||
}
|
||||
return adminCookieName + "=" + token + "; Path=/; Max-Age=" + strconv.Itoa(maxAge) + "; HttpOnly; SameSite=None; Secure"
|
||||
}
|
||||
|
||||
// GetAdminTokenFromRequest 从请求 Cookie 中读取 admin_session
|
||||
func GetAdminTokenFromRequest(r *http.Request) string {
|
||||
c, err := r.Cookie(adminCookieName)
|
||||
|
||||
Reference in New Issue
Block a user