From fe4a6e63af9bca2c4a2d7a0212ce7670067c13de Mon Sep 17 00:00:00 2001
From: mlogclub <mlog1@qq.com>
Date: Tue, 28 Apr 2026 10:43:38 +0800
Subject: [PATCH] refactor: streamline UserTokenClaims structure and simplify
 VerifyUserToken function

---
 internal/pkg/openidentity/openidentity.go | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/internal/pkg/openidentity/openidentity.go b/internal/pkg/openidentity/openidentity.go
index b9df3dc..ba89bd6 100644
--- a/internal/pkg/openidentity/openidentity.go
+++ b/internal/pkg/openidentity/openidentity.go
@@ -22,13 +22,6 @@ type ExternalInfo struct {
 }
 
 type UserTokenClaims struct {
-	UserID string `json:"userId"`
-	Name   string `json:"name"`
-	Exp    int64  `json:"exp"`
-	Iat    int64  `json:"iat"`
-}
-
-type userTokenJWTClaims struct {
 	UserID string `json:"userId"`
 	Name   string `json:"name"`
 	jwt.RegisteredClaims
@@ -75,7 +68,7 @@ func VerifyUserToken(userToken, secret string) (*UserTokenClaims, error) {
 		return nil, errorsx.Unauthorized("用户身份校验未配置")
 	}
 
-	claims := &userTokenJWTClaims{}
+	claims := &UserTokenClaims{}
 	token, err := jwt.ParseWithClaims(userToken, claims, func(token *jwt.Token) (any, error) {
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 			return nil, errors.New("unsupported signing method")
@@ -106,15 +99,7 @@ func VerifyUserToken(userToken, secret string) (*UserTokenClaims, error) {
 		return nil, errorsx.Unauthorized("用户身份已过期")
 	}
 
-	result := &UserTokenClaims{
-		UserID: claims.UserID,
-		Name:   claims.Name,
-		Exp:    claims.ExpiresAt.Unix(),
-	}
-	if claims.IssuedAt != nil {
-		result.Iat = claims.IssuedAt.Unix()
-	}
-	return result, nil
+	return claims, nil
 }
 
 func parseUserToken(ctx iris.Context) string {