A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix(auth): enhance admin user cache management and add status checks for email verification and suspension
LinkinStars869b040e92d6
diff --git a/internal/base/middleware/auth.go b/internal/base/middleware/auth.goindex 57bbaae2..7bfd5e7f 100644--- a/internal/base/middleware/auth.go+++ b/internal/base/middleware/auth.go@@ -184,7 +184,22 @@ func (am *AuthUserMiddleware) AdminAuth() gin.HandlerFunc {return}if userInfo != nil {+ if userInfo.EmailStatus == entity.EmailStatusToBeVerified {+ _ = am.authService.RemoveAdminUserCacheInfo(ctx, token)+ handler.HandleResponse(ctx, errors.Forbidden(reason.EmailNeedToBeVerified),+ &schema.ForbiddenResp{Type: schema.ForbiddenReasonTypeInactive})+ ctx.Abort()+ return+ }+ if userInfo.UserStatus == entity.UserStatusSuspended {+ _ = am.authService.RemoveAdminUserCacheInfo(ctx, token)+ handler.HandleResponse(ctx, errors.Forbidden(reason.UserSuspended),+ &schema.ForbiddenResp{Type: schema.ForbiddenReasonTypeUserSuspended})+ ctx.Abort()+ return+ }if userInfo.UserStatus == entity.UserStatusDeleted {+ _ = am.authService.RemoveAdminUserCacheInfo(ctx, token)handler.HandleResponse(ctx, errors.Unauthorized(reason.UnauthorizedError), nil)ctx.Abort()returndiff --git a/internal/service/auth/auth.go b/internal/service/auth/auth.goindex 8f539bf1..7d275105 100644--- a/internal/service/auth/auth.go+++ b/internal/service/auth/auth.go@@ -145,7 +145,39 @@ func (as *AuthService) RemoveTokensExceptCurrentUser(ctx context.Context, userID// Adminfunc (as *AuthService) GetAdminUserCacheInfo(ctx context.Context, accessToken string) (userInfo *entity.UserCacheInfo, err error) {- return as.authRepo.GetAdminUserCacheInfo(ctx, accessToken)+ adminCacheInfo, err := as.authRepo.GetAdminUserCacheInfo(ctx, accessToken)+ if err != nil {+ return nil, err+ }+ if adminCacheInfo == nil {+ return nil, nil+ }++ // Keep admin authorization aligned with user-token lifecycle and status refresh.+ refreshedUserCacheInfo, err := as.GetUserCacheInfo(ctx, accessToken)+ if err != nil {+ return nil, err+ }+ if refreshedUserCacheInfo == nil {+ if err = as.authRepo.RemoveAdminUserCacheInfo(ctx, accessToken); err != nil {+ return nil, err+ }+ return nil, nil+ }++ adminCacheInfo.UserStatus = refreshedUserCacheInfo.UserStatus+ adminCacheInfo.EmailStatus = refreshedUserCacheInfo.EmailStatus+ if refreshedUserCacheInfo.RoleID > 0 {+ adminCacheInfo.RoleID = refreshedUserCacheInfo.RoleID+ }+ if len(refreshedUserCacheInfo.ExternalID) > 0 {+ adminCacheInfo.ExternalID = refreshedUserCacheInfo.ExternalID+ }++ if err = as.authRepo.SetAdminUserCacheInfo(ctx, accessToken, adminCacheInfo); err != nil {+ return nil, err+ }+ return adminCacheInfo, nil}func (as *AuthService) SetAdminUserCacheInfo(ctx context.Context, accessToken string, userInfo *entity.UserCacheInfo) (err error) {