优化结构

internal/server/handler/http.go

@@ -14,7 +14,7 @@ import (
 const (
 	CodeSuccess                = httpx.CodeSuccess
 	CodeError                  = httpx.CodeError
-	CodePasswordChangeRequired = httpx.CodePasswordChangeRequired
+	CodePasswordChangeRequired = middleware.CodePasswordChangeRequired
 )
 
 type Response = httpx.Response
@@ -25,5 +25,7 @@ func OK(c *gin.Context)                                        { httpx.OK(c) }
 func OKWithData(c *gin.Context, data any)                      { httpx.OKWithData(c, data) }
 func Fail(c *gin.Context, message string)                      { httpx.Fail(c, message) }
 func NoAuth(c *gin.Context, message string)                    { httpx.NoAuth(c, message) }
-func SetTokenCookie(c *gin.Context, value string, maxAge int)  { httpx.SetTokenCookie(c, value, maxAge) }
-func Claims(c *gin.Context) *system.AuthClaims                 { return middleware.Claims(c) }
+func SetTokenCookie(c *gin.Context, value string, maxAge int) {
+	httpx.SetCookie(c, "x-token", value, maxAge)
+}
+func Claims(c *gin.Context) *system.AuthClaims { return middleware.Claims(c) }

internal/server/httpx/response.go

@@ -12,9 +12,8 @@ import (
 )
 
 const (
-	CodeSuccess                = 0
-	CodeError                  = 7
-	CodePasswordChangeRequired = 10001
+	CodeSuccess = 0
+	CodeError   = 7
 )
 
 type Response struct {
@@ -55,12 +54,13 @@ func requestUsesHTTPS(request *http.Request) bool {
 	return strings.EqualFold(strings.TrimSpace(forwarded), "https")
 }
 
-// SetTokenCookie is the shared transport-level cookie policy for the admin API.
-func SetTokenCookie(c *gin.Context, value string, maxAge int) {
+// SetCookie applies the transport-level cookie policy without knowing the
+// application's cookie names or authentication semantics.
+func SetCookie(c *gin.Context, name, value string, maxAge int) {
 	if c == nil {
 		return
 	}
-	cookie := &http.Cookie{Name: "x-token", Value: value, Path: "/", MaxAge: maxAge, Secure: requestUsesHTTPS(c.Request), HttpOnly: true, SameSite: http.SameSiteStrictMode}
+	cookie := &http.Cookie{Name: name, Value: value, Path: "/", MaxAge: maxAge, Secure: requestUsesHTTPS(c.Request), HttpOnly: true, SameSite: http.SameSiteStrictMode}
 	if maxAge < 0 {
 		cookie.Expires = time.Unix(1, 0)
 	}

internal/server/httpx/response_test.go

@@ -2,6 +2,7 @@ package httpx
 
 import (
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/gin-gonic/gin"
@@ -31,3 +32,15 @@ func TestResponseHelpers(t *testing.T) {
 		}
 	}
 }
+
+func TestSetCookieUsesRequestedName(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	r := gin.New()
+	r.GET("/cookie", func(c *gin.Context) { SetCookie(c, "example", "value", 60) })
+	req := httptest.NewRequest("GET", "/cookie", nil)
+	w := httptest.NewRecorder()
+	r.ServeHTTP(w, req)
+	if got := w.Header().Get("Set-Cookie"); !strings.HasPrefix(got, "example=") {
+		t.Fatalf("Set-Cookie = %q", got)
+	}
+}

internal/server/middleware/auth.go

@@ -16,6 +16,8 @@ import (
 
 const claimsKey = "admin_claims"
 
+const CodePasswordChangeRequired = 10001
+
 // tokenAuthTimeout bounds a shared token authentication flight. It replaces the
 // leader request's own deadline, which followers must not inherit.
 const tokenAuthTimeout = 10 * time.Second
@@ -62,20 +64,20 @@ func authenticate(c *gin.Context, auth TokenAuthenticator, allowQueryToken bool)
 		return auth.AuthenticateToken(ctx, token)
 	})
 	if err != nil {
-		httpx.SetTokenCookie(c, "", -1)
+		httpx.SetCookie(c, "x-token", "", -1)
 		httpx.NoAuth(c, tokenErrorMessage(err))
 		return false
 	}
 	authentication, ok := value.(*system.TokenAuthentication)
 	if !ok || authentication == nil || authentication.Claims == nil {
-		httpx.SetTokenCookie(c, "", -1)
+		httpx.SetCookie(c, "x-token", "", -1)
 		httpx.NoAuth(c, "无法处理此token")
 		return false
 	}
 	if authentication.Refreshed != nil {
 		c.Header("new-token", authentication.Refreshed.Value)
 		c.Header("new-expires-at", strconv.FormatInt(authentication.Refreshed.ExpiresAt.Unix(), 10))
-		httpx.SetTokenCookie(c, authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
+		httpx.SetCookie(c, "x-token", authentication.Refreshed.Value, int(authentication.Refreshed.TTL.Seconds()))
 	}
 	c.Set(claimsKey, authentication.Claims)
 	return true
@@ -141,6 +143,6 @@ func MustChangePassword() gin.HandlerFunc {
 			c.Next()
 			return
 		}
-		c.AbortWithStatusJSON(http.StatusConflict, httpx.Response{Code: httpx.CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
+		c.AbortWithStatusJSON(http.StatusConflict, httpx.Response{Code: CodePasswordChangeRequired, Data: gin.H{"needChangePassword": true}, Msg: "密码已过期，请先修改密码"})
 	}
 }