perf(auth): 降低会话校验请求与重复查库
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"hfb_sys/backend/internal/logging"
|
"hfb_sys/backend/internal/logging"
|
||||||
|
"hfb_sys/backend/internal/model"
|
||||||
"hfb_sys/backend/internal/modules/auth"
|
"hfb_sys/backend/internal/modules/auth"
|
||||||
"hfb_sys/backend/internal/sitecode"
|
"hfb_sys/backend/internal/sitecode"
|
||||||
"hfb_sys/backend/internal/tenancy"
|
"hfb_sys/backend/internal/tenancy"
|
||||||
@@ -17,6 +18,7 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
ContextUserID = "user_id"
|
ContextUserID = "user_id"
|
||||||
|
ContextUser = "auth_user"
|
||||||
ContextPhone = "phone"
|
ContextPhone = "phone"
|
||||||
ContextAdminID = "admin_id"
|
ContextAdminID = "admin_id"
|
||||||
ContextUsername = "username"
|
ContextUsername = "username"
|
||||||
@@ -37,7 +39,17 @@ type AdminTokenContext struct {
|
|||||||
|
|
||||||
type AdminTokenValidatorFunc func(ctx context.Context, adminID uint64, tokenVersion int64) (AdminTokenContext, error)
|
type AdminTokenValidatorFunc func(ctx context.Context, adminID uint64, tokenVersion int64) (AdminTokenContext, error)
|
||||||
|
|
||||||
type UserTokenValidatorFunc func(ctx context.Context, userID uint64, tokenVersion int64) error
|
type UserTokenValidatorFunc func(ctx context.Context, userID uint64, tokenVersion int64) (*model.User, error)
|
||||||
|
|
||||||
|
// AuthenticatedUser 返回本次请求鉴权时已经加载的用户记录。
|
||||||
|
func AuthenticatedUser(c *gin.Context) (*model.User, bool) {
|
||||||
|
value, ok := c.Get(ContextUser)
|
||||||
|
if !ok {
|
||||||
|
return nil, false
|
||||||
|
}
|
||||||
|
user, ok := value.(*model.User)
|
||||||
|
return user, ok && user != nil
|
||||||
|
}
|
||||||
|
|
||||||
func extractBearerToken(c *gin.Context) string {
|
func extractBearerToken(c *gin.Context) string {
|
||||||
header := c.GetHeader("Authorization")
|
header := c.GetHeader("Authorization")
|
||||||
@@ -85,8 +97,11 @@ func Auth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc) gin.Hand
|
|||||||
c.Abort()
|
c.Abort()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
var authenticatedUser *model.User
|
||||||
if validate != nil {
|
if validate != nil {
|
||||||
if err := validate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
var err error
|
||||||
|
authenticatedUser, err = validate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||||
|
if err != nil {
|
||||||
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
||||||
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
||||||
} else {
|
} else {
|
||||||
@@ -99,6 +114,9 @@ func Auth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc) gin.Hand
|
|||||||
|
|
||||||
c.Set(ContextUserID, claims.UserID)
|
c.Set(ContextUserID, claims.UserID)
|
||||||
c.Set(ContextPhone, claims.Phone)
|
c.Set(ContextPhone, claims.Phone)
|
||||||
|
if authenticatedUser != nil {
|
||||||
|
c.Set(ContextUser, authenticatedUser)
|
||||||
|
}
|
||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -125,14 +143,20 @@ func OptionalAuth(jwtManager *auth.JWTManager, validate UserTokenValidatorFunc)
|
|||||||
c.Next()
|
c.Next()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
var authenticatedUser *model.User
|
||||||
if validate != nil {
|
if validate != nil {
|
||||||
if err := validate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
var err error
|
||||||
|
authenticatedUser, err = validate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||||
|
if err != nil {
|
||||||
c.Next()
|
c.Next()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
c.Set(ContextUserID, claims.UserID)
|
c.Set(ContextUserID, claims.UserID)
|
||||||
c.Set(ContextPhone, claims.Phone)
|
c.Set(ContextPhone, claims.Phone)
|
||||||
|
if authenticatedUser != nil {
|
||||||
|
c.Set(ContextUser, authenticatedUser)
|
||||||
|
}
|
||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -195,8 +219,11 @@ func AuthUserOrAdmin(jwtManager *auth.JWTManager, userValidate UserTokenValidato
|
|||||||
c.Abort()
|
c.Abort()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
var authenticatedUser *model.User
|
||||||
if userValidate != nil {
|
if userValidate != nil {
|
||||||
if err := userValidate(c.Request.Context(), claims.UserID, claims.TokenVersion); err != nil {
|
var err error
|
||||||
|
authenticatedUser, err = userValidate(c.Request.Context(), claims.UserID, claims.TokenVersion)
|
||||||
|
if err != nil {
|
||||||
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
if errors.Is(err, auth.ErrDependencyUnavailable) {
|
||||||
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
response.ServiceUnavailable(c, "用户认证服务暂时不可用")
|
||||||
} else {
|
} else {
|
||||||
@@ -209,6 +236,9 @@ func AuthUserOrAdmin(jwtManager *auth.JWTManager, userValidate UserTokenValidato
|
|||||||
|
|
||||||
c.Set(ContextUserID, claims.UserID)
|
c.Set(ContextUserID, claims.UserID)
|
||||||
c.Set(ContextPhone, claims.Phone)
|
c.Set(ContextPhone, claims.Phone)
|
||||||
|
if authenticatedUser != nil {
|
||||||
|
c.Set(ContextUser, authenticatedUser)
|
||||||
|
}
|
||||||
c.Next()
|
c.Next()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"hfb_sys/backend/internal/model"
|
||||||
"hfb_sys/backend/internal/modules/auth"
|
"hfb_sys/backend/internal/modules/auth"
|
||||||
"hfb_sys/backend/internal/sitecode"
|
"hfb_sys/backend/internal/sitecode"
|
||||||
"hfb_sys/backend/internal/tenancy"
|
"hfb_sys/backend/internal/tenancy"
|
||||||
@@ -67,8 +68,8 @@ func TestAuthRejectsRevokedUserToken(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
engine := gin.New()
|
engine := gin.New()
|
||||||
engine.GET("/protected", Auth(manager, func(_ context.Context, _ uint64, _ int64) error {
|
engine.GET("/protected", Auth(manager, func(_ context.Context, _ uint64, _ int64) (*model.User, error) {
|
||||||
return auth.ErrTokenVersionMismatch
|
return nil, auth.ErrTokenVersionMismatch
|
||||||
}), func(c *gin.Context) {
|
}), func(c *gin.Context) {
|
||||||
c.Status(http.StatusNoContent)
|
c.Status(http.StatusNoContent)
|
||||||
})
|
})
|
||||||
@@ -82,6 +83,38 @@ func TestAuthRejectsRevokedUserToken(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUserAuthAttachesValidatedUser(t *testing.T) {
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
manager := auth.NewJWTManager("test-auth-user-context-secret")
|
||||||
|
pair, err := manager.GenerateSubjectPairWithVersion(7, "13900000007", "user", 1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("生成令牌失败:%v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
engine := gin.New()
|
||||||
|
engine.GET("/protected", Auth(manager, func(_ context.Context, userID uint64, tokenVersion int64) (*model.User, error) {
|
||||||
|
if userID != 7 || tokenVersion != 1 {
|
||||||
|
t.Fatalf("校验参数 = (%d, %d), want (7, 1)", userID, tokenVersion)
|
||||||
|
}
|
||||||
|
return &model.User{ID: userID, Nickname: "已鉴权用户", Status: "active", TokenVersion: tokenVersion}, nil
|
||||||
|
}), func(c *gin.Context) {
|
||||||
|
user, ok := AuthenticatedUser(c)
|
||||||
|
if !ok || user.Nickname != "已鉴权用户" {
|
||||||
|
t.Fatalf("AuthenticatedUser() = %+v, %v", user, ok)
|
||||||
|
}
|
||||||
|
c.Status(http.StatusNoContent)
|
||||||
|
})
|
||||||
|
|
||||||
|
request := httptest.NewRequest(http.MethodGet, "/protected", nil)
|
||||||
|
request.Header.Set("Authorization", "Bearer "+pair.AccessToken)
|
||||||
|
response := httptest.NewRecorder()
|
||||||
|
engine.ServeHTTP(response, request)
|
||||||
|
|
||||||
|
if response.Code != http.StatusNoContent {
|
||||||
|
t.Fatalf("响应状态 = %d, want %d", response.Code, http.StatusNoContent)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestUserAndAdminTokensRejectCrossTenantRequests(t *testing.T) {
|
func TestUserAndAdminTokensRejectCrossTenantRequests(t *testing.T) {
|
||||||
gin.SetMode(gin.TestMode)
|
gin.SetMode(gin.TestMode)
|
||||||
manager := auth.NewJWTManager("cross-tenant-auth-test-secret")
|
manager := auth.NewJWTManager("cross-tenant-auth-test-secret")
|
||||||
|
|||||||
@@ -217,6 +217,11 @@ func (h *Handler) Logout(c *gin.Context) {
|
|||||||
response.OK(c, gin.H{"logged_out": true})
|
response.OK(c, gin.H{"logged_out": true})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Session 返回当前 access token 仍有效。数据库校验由 requireAuth 完成,这里不重复查询。
|
||||||
|
func (h *Handler) Session(c *gin.Context) {
|
||||||
|
response.OK(c, gin.H{"active": true})
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handler) PasswordLogin(c *gin.Context) {
|
func (h *Handler) PasswordLogin(c *gin.Context) {
|
||||||
var req PasswordLoginRequest
|
var req PasswordLoginRequest
|
||||||
if err := c.ShouldBindJSON(&req); err != nil {
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
|||||||
@@ -58,6 +58,15 @@ func (r *UserRepository) FindByID(ctx context.Context, id uint64) (*model.User,
|
|||||||
|
|
||||||
// FindActiveForToken 校验用户仍可用且令牌版本未被撤销。
|
// FindActiveForToken 校验用户仍可用且令牌版本未被撤销。
|
||||||
func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, tokenVersion int64) (*model.User, error) {
|
func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, tokenVersion int64) (*model.User, error) {
|
||||||
|
return r.findActiveForToken(ctx, id, tokenVersion, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindActiveForTokenWithProfile 校验令牌并一次加载完整用户资料,供 /api/me 使用。
|
||||||
|
func (r *UserRepository) FindActiveForTokenWithProfile(ctx context.Context, id uint64, tokenVersion int64) (*model.User, error) {
|
||||||
|
return r.findActiveForToken(ctx, id, tokenVersion, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *UserRepository) findActiveForToken(ctx context.Context, id uint64, tokenVersion int64, withProfile bool) (*model.User, error) {
|
||||||
if r == nil || r.db == nil {
|
if r == nil || r.db == nil {
|
||||||
return nil, ErrDependencyUnavailable
|
return nil, ErrDependencyUnavailable
|
||||||
}
|
}
|
||||||
@@ -67,9 +76,10 @@ func (r *UserRepository) FindActiveForToken(ctx context.Context, id uint64, toke
|
|||||||
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
|
||||||
}
|
}
|
||||||
query = scopeUserQueryToBoundSite(ctx, query)
|
query = scopeUserQueryToBoundSite(ctx, query)
|
||||||
if err := query.
|
if !withProfile {
|
||||||
Select("users.id, users.phone, users.status, users.token_version").
|
query = query.Select("users.id, users.phone, users.status, users.token_version")
|
||||||
First(&user, id).Error; err != nil {
|
}
|
||||||
|
if err := query.First(&user, id).Error; err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if user.Status != "active" {
|
if user.Status != "active" {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import (
|
|||||||
func TestUserTokenVersionRevokesAccessAndRefreshTokens(t *testing.T) {
|
func TestUserTokenVersionRevokesAccessAndRefreshTokens(t *testing.T) {
|
||||||
db := database.NewTestDB()
|
db := database.NewTestDB()
|
||||||
|
|
||||||
user := model.User{Phone: "13900000001", Status: "active", TokenVersion: 1}
|
user := model.User{Phone: "13900000001", Nickname: "完整资料", Status: "active", TokenVersion: 1}
|
||||||
if err := db.Create(&user).Error; err != nil {
|
if err := db.Create(&user).Error; err != nil {
|
||||||
t.Fatalf("创建用户失败:%v", err)
|
t.Fatalf("创建用户失败:%v", err)
|
||||||
}
|
}
|
||||||
@@ -22,10 +22,20 @@ func TestUserTokenVersionRevokesAccessAndRefreshTokens(t *testing.T) {
|
|||||||
t.Fatalf("生成令牌失败:%v", err)
|
t.Fatalf("生成令牌失败:%v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = repo.FindActiveForToken(t.Context(), user.ID, 1)
|
minimal, err := repo.FindActiveForToken(t.Context(), user.ID, 1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("有效令牌校验失败:%v", err)
|
t.Fatalf("有效令牌校验失败:%v", err)
|
||||||
}
|
}
|
||||||
|
if minimal.Nickname != "" {
|
||||||
|
t.Fatalf("轻量令牌校验不应加载完整资料:%+v", minimal)
|
||||||
|
}
|
||||||
|
profile, err := repo.FindActiveForTokenWithProfile(t.Context(), user.ID, 1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("完整资料令牌校验失败:%v", err)
|
||||||
|
}
|
||||||
|
if profile.Nickname != user.Nickname {
|
||||||
|
t.Fatalf("完整资料昵称 = %q, want %q", profile.Nickname, user.Nickname)
|
||||||
|
}
|
||||||
|
|
||||||
if err := db.Model(&model.User{}).Where("id = ?", user.ID).Updates(map[string]any{
|
if err := db.Model(&model.User{}).Where("id = ?", user.ID).Updates(map[string]any{
|
||||||
"status": "frozen",
|
"status": "frozen",
|
||||||
|
|||||||
@@ -26,6 +26,10 @@ func NewHandler(users *auth.UserRepository) *Handler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handler) Me(c *gin.Context) {
|
func (h *Handler) Me(c *gin.Context) {
|
||||||
|
if cached, ok := middleware.AuthenticatedUser(c); ok {
|
||||||
|
response.OK(c, cached)
|
||||||
|
return
|
||||||
|
}
|
||||||
if h.users == nil {
|
if h.users == nil {
|
||||||
response.ServiceUnavailable(c, "数据库未连接")
|
response.ServiceUnavailable(c, "数据库未连接")
|
||||||
return
|
return
|
||||||
@@ -35,7 +39,12 @@ func (h *Handler) Me(c *gin.Context) {
|
|||||||
response.Unauthorized(c, "缺少用户上下文")
|
response.Unauthorized(c, "缺少用户上下文")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
user, err := h.users.FindByID(c.Request.Context(), userID.(uint64))
|
id, ok := userID.(uint64)
|
||||||
|
if !ok {
|
||||||
|
response.Unauthorized(c, "用户上下文无效")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
user, err := h.users.FindByID(c.Request.Context(), id)
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
response.Unauthorized(c, "用户不存在")
|
response.Unauthorized(c, "用户不存在")
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package user
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"hfb_sys/backend/internal/middleware"
|
||||||
|
"hfb_sys/backend/internal/model"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMeUsesUserLoadedByAuthMiddleware(t *testing.T) {
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
|
||||||
|
engine := gin.New()
|
||||||
|
engine.GET("/me", func(c *gin.Context) {
|
||||||
|
c.Set(middleware.ContextUserID, uint64(7))
|
||||||
|
c.Set(middleware.ContextUser, &model.User{
|
||||||
|
ID: 7,
|
||||||
|
Phone: "13900000007",
|
||||||
|
Nickname: "已鉴权用户",
|
||||||
|
Status: "active",
|
||||||
|
})
|
||||||
|
c.Next()
|
||||||
|
}, NewHandler(nil).Me)
|
||||||
|
|
||||||
|
request := httptest.NewRequest(http.MethodGet, "/me", nil)
|
||||||
|
response := httptest.NewRecorder()
|
||||||
|
engine.ServeHTTP(response, request)
|
||||||
|
|
||||||
|
if response.Code != http.StatusOK {
|
||||||
|
t.Fatalf("响应状态 = %d, want %d", response.Code, http.StatusOK)
|
||||||
|
}
|
||||||
|
if !strings.Contains(response.Body.String(), `"nickname":"已鉴权用户"`) {
|
||||||
|
t.Fatalf("响应未复用鉴权用户:%s", response.Body.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import (
|
|||||||
"hfb_sys/backend/internal/config"
|
"hfb_sys/backend/internal/config"
|
||||||
"hfb_sys/backend/internal/handler"
|
"hfb_sys/backend/internal/handler"
|
||||||
"hfb_sys/backend/internal/middleware"
|
"hfb_sys/backend/internal/middleware"
|
||||||
|
"hfb_sys/backend/internal/model"
|
||||||
"hfb_sys/backend/internal/modules/adminaudit"
|
"hfb_sys/backend/internal/modules/adminaudit"
|
||||||
"hfb_sys/backend/internal/modules/adminauth"
|
"hfb_sys/backend/internal/modules/adminauth"
|
||||||
"hfb_sys/backend/internal/modules/admindashboard"
|
"hfb_sys/backend/internal/modules/admindashboard"
|
||||||
@@ -474,14 +475,20 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
|
|||||||
adTrackingService := adtracking.NewService(adTrackingRepo, deps.Redis, !config.IsProductionEnv(cfg.AppEnv))
|
adTrackingService := adtracking.NewService(adTrackingRepo, deps.Redis, !config.IsProductionEnv(cfg.AppEnv))
|
||||||
adTrackingHandler := adtracking.NewHandler(adTrackingService)
|
adTrackingHandler := adtracking.NewHandler(adTrackingService)
|
||||||
engine.GET("/r/:code", adTrackingHandler.Redirect)
|
engine.GET("/r/:code", adTrackingHandler.Redirect)
|
||||||
validateUserToken := func(ctx context.Context, userID uint64, tokenVersion int64) error {
|
validateUserToken := func(ctx context.Context, userID uint64, tokenVersion int64) (*model.User, error) {
|
||||||
if userRepo == nil {
|
if userRepo == nil {
|
||||||
return auth.ErrDependencyUnavailable
|
return nil, auth.ErrDependencyUnavailable
|
||||||
}
|
}
|
||||||
_, err := userRepo.FindActiveForToken(ctx, userID, tokenVersion)
|
return userRepo.FindActiveForToken(ctx, userID, tokenVersion)
|
||||||
return err
|
}
|
||||||
|
validateUserProfile := func(ctx context.Context, userID uint64, tokenVersion int64) (*model.User, error) {
|
||||||
|
if userRepo == nil {
|
||||||
|
return nil, auth.ErrDependencyUnavailable
|
||||||
|
}
|
||||||
|
return userRepo.FindActiveForTokenWithProfile(ctx, userID, tokenVersion)
|
||||||
}
|
}
|
||||||
requireAuth := middleware.Auth(jwtManager, validateUserToken)
|
requireAuth := middleware.Auth(jwtManager, validateUserToken)
|
||||||
|
requireUserProfile := middleware.Auth(jwtManager, validateUserProfile)
|
||||||
optionalAuth := middleware.OptionalAuth(jwtManager, validateUserToken)
|
optionalAuth := middleware.OptionalAuth(jwtManager, validateUserToken)
|
||||||
var validateAdminToken middleware.AdminTokenValidatorFunc
|
var validateAdminToken middleware.AdminTokenValidatorFunc
|
||||||
if adminAuthRepo != nil {
|
if adminAuthRepo != nil {
|
||||||
@@ -570,12 +577,13 @@ func New(cfg config.Config, deps Dependencies, logger *zap.Logger) *gin.Engine {
|
|||||||
authRoutes.POST("/password/reset", authHandler.ResetPassword)
|
authRoutes.POST("/password/reset", authHandler.ResetPassword)
|
||||||
authRoutes.POST("/refresh", authHandler.Refresh)
|
authRoutes.POST("/refresh", authHandler.Refresh)
|
||||||
authRoutes.POST("/logout", requireAuth, authHandler.Logout)
|
authRoutes.POST("/logout", requireAuth, authHandler.Logout)
|
||||||
|
authRoutes.GET("/session", requireAuth, authHandler.Session)
|
||||||
if chatHubHandler != nil {
|
if chatHubHandler != nil {
|
||||||
authRoutes.GET("/events", requireAuth, chatHubHandler.UserEvents)
|
authRoutes.GET("/events", requireAuth, chatHubHandler.UserEvents)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
api.GET("/me", requireAuth, userHandler.Me)
|
api.GET("/me", requireUserProfile, userHandler.Me)
|
||||||
api.PUT("/me", requireAuth, userHandler.UpdateMe)
|
api.PUT("/me", requireAuth, userHandler.UpdateMe)
|
||||||
api.PUT("/password", requireAuth, authHandler.SetPassword)
|
api.PUT("/password", requireAuth, authHandler.SetPassword)
|
||||||
|
|
||||||
|
|||||||
@@ -111,6 +111,11 @@ export async function fetchMe(options?: { silent?: boolean }) {
|
|||||||
return data.data
|
return data.data
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function fetchSessionState(options?: { silent?: boolean }) {
|
||||||
|
const { data } = await apiClient.get<ApiResponse<{ active: boolean }>>('/auth/session', options)
|
||||||
|
return data.data
|
||||||
|
}
|
||||||
|
|
||||||
export async function updateMe(payload: Pick<AuthUser, 'nickname' | 'avatar_url'>) {
|
export async function updateMe(payload: Pick<AuthUser, 'nickname' | 'avatar_url'>) {
|
||||||
const { data } = await apiClient.put<ApiResponse<AuthUser>>('/me', payload)
|
const { data } = await apiClient.put<ApiResponse<AuthUser>>('/me', payload)
|
||||||
return data.data
|
return data.data
|
||||||
|
|||||||
@@ -1,19 +1,23 @@
|
|||||||
import { onBeforeUnmount, onMounted, watch } from 'vue'
|
import { onBeforeUnmount, onMounted, watch } from 'vue'
|
||||||
|
|
||||||
import { fetchMe } from '@/features/auth/api/auth'
|
import { fetchSessionState } from '@/features/auth/api/auth'
|
||||||
import { getAccessToken, type AuthScope } from '@/shared/utils/authStorage'
|
import { type AuthScope } from '@/shared/utils/authStorage'
|
||||||
import { useSessionStore } from '@/stores/session'
|
import { useSessionStore } from '@/stores/session'
|
||||||
|
|
||||||
const scope: AuthScope = 'user'
|
const scope: AuthScope = 'user'
|
||||||
const reconnectDelay = 3000
|
const reconnectBaseDelay = 3000
|
||||||
const verificationInterval = 5000
|
const reconnectMaxDelay = 60_000
|
||||||
|
const verificationInterval = 300_000
|
||||||
|
const foregroundVerificationMinGap = 60_000
|
||||||
|
|
||||||
// 保持一个轻量级会话通道,使后台冻结能在没有页面请求时立即让用户退出。
|
// SSE 负责即时撤销通知,低频会话校验只作为断线与异常场景的兜底。
|
||||||
export function useSessionMonitor() {
|
export function useSessionMonitor() {
|
||||||
const session = useSessionStore()
|
const session = useSessionStore()
|
||||||
let source: EventSource | null = null
|
let source: EventSource | null = null
|
||||||
let reconnectTimer: number | null = null
|
let reconnectTimer: number | null = null
|
||||||
let verificationTimer: number | null = null
|
let verificationTimer: number | null = null
|
||||||
|
let reconnectAttempt = 0
|
||||||
|
let lastVerifiedAt = 0
|
||||||
let checking = false
|
let checking = false
|
||||||
let stopped = false
|
let stopped = false
|
||||||
|
|
||||||
@@ -24,17 +28,21 @@ export function useSessionMonitor() {
|
|||||||
|
|
||||||
function scheduleReconnect() {
|
function scheduleReconnect() {
|
||||||
if (stopped || reconnectTimer !== null || !session.isLoggedIn) return
|
if (stopped || reconnectTimer !== null || !session.isLoggedIn) return
|
||||||
|
const exponentialDelay = Math.min(reconnectMaxDelay, reconnectBaseDelay * 2 ** reconnectAttempt)
|
||||||
|
const jitteredDelay = Math.round(exponentialDelay * (0.8 + Math.random() * 0.4))
|
||||||
|
reconnectAttempt = Math.min(reconnectAttempt + 1, 10)
|
||||||
reconnectTimer = window.setTimeout(() => {
|
reconnectTimer = window.setTimeout(() => {
|
||||||
reconnectTimer = null
|
reconnectTimer = null
|
||||||
connect()
|
connect()
|
||||||
}, reconnectDelay)
|
}, jitteredDelay)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function verifySession() {
|
async function verifySession() {
|
||||||
if (stopped || checking || !session.isLoggedIn) return
|
if (stopped || checking || !session.isLoggedIn) return
|
||||||
checking = true
|
checking = true
|
||||||
try {
|
try {
|
||||||
await fetchMe({ silent: true })
|
const state = await fetchSessionState({ silent: true })
|
||||||
|
if (state.active) lastVerifiedAt = Date.now()
|
||||||
} catch {
|
} catch {
|
||||||
// 认证失败由 axios 拦截器清理令牌并跳转;网络错误等待下一次校验。
|
// 认证失败由 axios 拦截器清理令牌并跳转;网络错误等待下一次校验。
|
||||||
} finally {
|
} finally {
|
||||||
@@ -44,13 +52,13 @@ export function useSessionMonitor() {
|
|||||||
|
|
||||||
function connect() {
|
function connect() {
|
||||||
if (stopped || source || !session.isLoggedIn) return
|
if (stopped || source || !session.isLoggedIn) return
|
||||||
const token = getAccessToken(scope)
|
|
||||||
if (!token) return
|
|
||||||
|
|
||||||
source = new EventSource(`/api/auth/events?token=${encodeURIComponent(token)}`, {
|
source = new EventSource('/api/auth/events', {
|
||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
})
|
})
|
||||||
source.addEventListener('connected', () => undefined)
|
source.addEventListener('connected', () => {
|
||||||
|
reconnectAttempt = 0
|
||||||
|
})
|
||||||
source.onerror = () => {
|
source.onerror = () => {
|
||||||
closeSource()
|
closeSource()
|
||||||
void verifySession()
|
void verifySession()
|
||||||
@@ -58,6 +66,15 @@ export function useSessionMonitor() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function startVerificationTimer() {
|
||||||
|
if (verificationTimer !== null) {
|
||||||
|
window.clearInterval(verificationTimer)
|
||||||
|
verificationTimer = null
|
||||||
|
}
|
||||||
|
if (stopped || document.hidden || !session.isLoggedIn) return
|
||||||
|
verificationTimer = window.setInterval(verifySession, verificationInterval)
|
||||||
|
}
|
||||||
|
|
||||||
function stop() {
|
function stop() {
|
||||||
closeSource()
|
closeSource()
|
||||||
if (reconnectTimer !== null) {
|
if (reconnectTimer !== null) {
|
||||||
@@ -68,6 +85,7 @@ export function useSessionMonitor() {
|
|||||||
window.clearInterval(verificationTimer)
|
window.clearInterval(verificationTimer)
|
||||||
verificationTimer = null
|
verificationTimer = null
|
||||||
}
|
}
|
||||||
|
reconnectAttempt = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function start() {
|
function start() {
|
||||||
@@ -75,7 +93,7 @@ export function useSessionMonitor() {
|
|||||||
if (!session.isLoggedIn) return
|
if (!session.isLoggedIn) return
|
||||||
connect()
|
connect()
|
||||||
void verifySession()
|
void verifySession()
|
||||||
verificationTimer = window.setInterval(verifySession, verificationInterval)
|
startVerificationTimer()
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleAuthStorageChanged(event: Event) {
|
function handleAuthStorageChanged(event: Event) {
|
||||||
@@ -89,7 +107,17 @@ export function useSessionMonitor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function handleVisibilityChange() {
|
function handleVisibilityChange() {
|
||||||
if (document.visibilityState === 'visible') void verifySession()
|
if (document.hidden) {
|
||||||
|
if (verificationTimer !== null) {
|
||||||
|
window.clearInterval(verificationTimer)
|
||||||
|
verificationTimer = null
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (Date.now() - lastVerifiedAt >= foregroundVerificationMinGap) {
|
||||||
|
void verifySession()
|
||||||
|
}
|
||||||
|
startVerificationTimer()
|
||||||
}
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user