fix: 设计原则审查修复 — DIP/ISP, LoD, DRY, OCP, URL, 301缓存
- P0 DIP+ISP: 全链路注入接口,消除零接口紧耦合 - P0 URL: auth 301→302,修复登出后浏览器缓存陷阱 - P1 DRY: JWT 认证逻辑收敛至 TokenService+中间件 - P2 DRY: 前后端角色/状态映射统一为 model 常量 - P2 LoD: 新增 SettingsController,router 不再跨层调 repo - P2 URL: settings ?tab= → /settings/:tab 伪静态 - P3 OCP: 角色权限 map 化,告别硬编码 switch
This commit is contained in:
@ -5,9 +5,7 @@ import (
|
||||
|
||||
"metazone.cc/metalab/internal/common"
|
||||
"metazone.cc/metalab/internal/config"
|
||||
"metazone.cc/metalab/internal/middleware"
|
||||
"metazone.cc/metalab/internal/model"
|
||||
"metazone.cc/metalab/internal/service"
|
||||
"metazone.cc/metalab/internal/theme"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@ -15,21 +13,21 @@ import (
|
||||
|
||||
// AuthController 认证相关页面 + API
|
||||
type AuthController struct {
|
||||
authService *service.AuthService
|
||||
tokenService *service.TokenService
|
||||
rateLimiter *middleware.RateLimiter
|
||||
authService authUseCase
|
||||
tokenService tokenRefresher
|
||||
rateLimiter rateLimiter
|
||||
cfg *config.Config
|
||||
}
|
||||
|
||||
// NewAuthController 构造函数
|
||||
func NewAuthController(authService *service.AuthService, tokenSvc *service.TokenService, limiter *middleware.RateLimiter, cfg *config.Config) *AuthController {
|
||||
func NewAuthController(authService authUseCase, tokenSvc tokenRefresher, limiter rateLimiter, cfg *config.Config) *AuthController {
|
||||
return &AuthController{authService: authService, tokenService: tokenSvc, rateLimiter: limiter, cfg: cfg}
|
||||
}
|
||||
|
||||
// RegisterPage 注册页面(已登录用户重定向到首页)
|
||||
func (ac *AuthController) RegisterPage(c *gin.Context) {
|
||||
if _, exists := c.Get("uid"); exists {
|
||||
c.Redirect(http.StatusMovedPermanently, "/")
|
||||
c.Redirect(http.StatusFound, "/")
|
||||
return
|
||||
}
|
||||
guidelines, err := theme.LoadContent("templates/MetaLab-2026/guidelines.html")
|
||||
@ -47,7 +45,7 @@ func (ac *AuthController) RegisterPage(c *gin.Context) {
|
||||
// LoginPage 登录页面(已登录用户重定向到首页)
|
||||
func (ac *AuthController) LoginPage(c *gin.Context) {
|
||||
if _, exists := c.Get("uid"); exists {
|
||||
c.Redirect(http.StatusMovedPermanently, "/")
|
||||
c.Redirect(http.StatusFound, "/")
|
||||
return
|
||||
}
|
||||
c.HTML(http.StatusOK, "auth/login.html", common.BuildPageData(c, gin.H{
|
||||
@ -103,13 +101,13 @@ func (ac *AuthController) Login(c *gin.Context) {
|
||||
}
|
||||
|
||||
switch err {
|
||||
case service.ErrInvalidCred:
|
||||
case common.ErrInvalidCred:
|
||||
common.Error(c, http.StatusUnauthorized, "邮箱或密码错误")
|
||||
case service.ErrUserBanned:
|
||||
case common.ErrUserBanned:
|
||||
common.Error(c, http.StatusForbidden, "账号已被封禁")
|
||||
case service.ErrUserLocked:
|
||||
case common.ErrUserLocked:
|
||||
common.Error(c, http.StatusUnauthorized, "邮箱或密码错误")
|
||||
case service.ErrUserDeleted:
|
||||
case common.ErrUserDeleted:
|
||||
// deleted 状态本应在 Login 中自动恢复,此 case 作为兜底
|
||||
common.Error(c, http.StatusForbidden, "该账号已申请注销,登录即自动恢复")
|
||||
default:
|
||||
@ -123,11 +121,7 @@ func (ac *AuthController) Login(c *gin.Context) {
|
||||
|
||||
common.SetAuthCookies(c, accessToken, refreshToken, req.RememberMe, ac.cfg)
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"success": true,
|
||||
"message": "登录成功",
|
||||
"data": user,
|
||||
})
|
||||
common.OkWithMessage(c, user, "登录成功")
|
||||
}
|
||||
|
||||
// CheckEmail 检查邮箱是否已注册
|
||||
@ -144,10 +138,7 @@ func (ac *AuthController) CheckEmail(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"success": true,
|
||||
"data": gin.H{"exists": exists},
|
||||
})
|
||||
common.Ok(c, gin.H{"exists": exists})
|
||||
}
|
||||
|
||||
// Register 注册 API
|
||||
@ -171,9 +162,9 @@ func (ac *AuthController) Register(c *gin.Context) {
|
||||
recordReg()
|
||||
}
|
||||
switch err {
|
||||
case service.ErrEmailExists:
|
||||
case common.ErrEmailExists:
|
||||
common.Error(c, http.StatusConflict, "该邮箱已注册")
|
||||
case service.ErrWeakPassword:
|
||||
case common.ErrWeakPassword:
|
||||
common.Error(c, http.StatusBadRequest, err.Error())
|
||||
default:
|
||||
common.Error(c, http.StatusInternalServerError, "注册失败,请稍后重试")
|
||||
@ -183,20 +174,13 @@ func (ac *AuthController) Register(c *gin.Context) {
|
||||
|
||||
common.SetAuthCookies(c, accessToken, refreshToken, req.RememberMe, ac.cfg)
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"success": true,
|
||||
"message": "注册成功!欢迎加入 MetaLab",
|
||||
"data": user,
|
||||
})
|
||||
common.OkWithMessage(c, user, "注册成功!欢迎加入 MetaLab")
|
||||
}
|
||||
|
||||
// Logout 退出登录:清除所有认证 Cookie
|
||||
func (ac *AuthController) Logout(c *gin.Context) {
|
||||
common.ClearAuthCookies(c, ac.cfg)
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"success": true,
|
||||
"message": "已退出登录",
|
||||
})
|
||||
common.OkMessage(c, "已退出登录")
|
||||
}
|
||||
|
||||
// RefreshToken 用 refresh token 换取新的 access token
|
||||
@ -207,23 +191,26 @@ func (ac *AuthController) RefreshToken(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
accessToken, _, err := ac.tokenService.RefreshAccessToken(refreshToken)
|
||||
accessToken, user, err := ac.tokenService.RefreshAccessToken(refreshToken)
|
||||
if err != nil {
|
||||
common.ClearAuthCookies(c, ac.cfg)
|
||||
switch err {
|
||||
case service.ErrTokenExpired, service.ErrTokenRevoked:
|
||||
case common.ErrTokenExpired, common.ErrTokenRevoked:
|
||||
common.Error(c, http.StatusUnauthorized, "登录凭证已失效,请重新登录")
|
||||
case service.ErrUserBanned:
|
||||
common.Error(c, http.StatusForbidden, "账号已被封禁")
|
||||
default:
|
||||
common.Error(c, http.StatusUnauthorized, "请重新登录")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 防止封禁用户通过 refresh 续期(状态检查是认证业务域,放在控制器层)
|
||||
if user.Status == model.StatusBanned {
|
||||
common.ClearAuthCookies(c, ac.cfg)
|
||||
common.Error(c, http.StatusForbidden, "账号已被封禁")
|
||||
return
|
||||
}
|
||||
|
||||
common.SetAccessCookie(c, accessToken, ac.cfg)
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"success": true,
|
||||
})
|
||||
common.Ok(c, nil)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user