优化

internal/data/runtime_settings.go

@@ -7,6 +7,8 @@ import (
 	"kra/internal/biz"
 	"kra/internal/conf"
 	"kra/pkg/adminauth"
+
+	jwt "github.com/golang-jwt/jwt/v5"
 )
 
 type runtimeSettings struct{ runtime *conf.Runtime }
@@ -94,6 +96,34 @@ func (i *tokenIssuer) IssueToken(user *biz.User, authorityID uint, mustChangePas
 	return &biz.IssuedToken{Value: token, ExpiresAt: claims.ExpiresAt.Time, TTL: expires}, nil
 }
 
+func (i *tokenIssuer) ReissueToken(source *biz.AuthClaims, authorityID uint) (*biz.IssuedToken, error) {
+	if source == nil {
+		return nil, errors.New("nil JWT claims")
+	}
+	settings := i.settings.JWTSettings()
+	claims := &adminauth.Claims{
+		UUID:          source.UUID,
+		ID:            source.ID,
+		Username:      source.Username,
+		NickName:      source.NickName,
+		AuthorityID:   authorityID,
+		BufferTime:    int64(source.BufferTime / time.Second),
+		UserType:      source.UserType,
+		MustChangePwd: source.MustChangePwd,
+		RegisteredClaims: jwt.RegisteredClaims{
+			Audience:  jwt.ClaimStrings(append([]string(nil), source.Audience...)),
+			Issuer:    source.Issuer,
+			NotBefore: jwt.NewNumericDate(source.NotBefore),
+			ExpiresAt: jwt.NewNumericDate(source.ExpiresAt),
+		},
+	}
+	token, err := adminauth.Sign(settings.SigningKey, claims)
+	if err != nil {
+		return nil, err
+	}
+	return &biz.IssuedToken{Value: token, ExpiresAt: source.ExpiresAt, TTL: time.Until(source.ExpiresAt)}, nil
+}
+
 func (i *tokenIssuer) ParseToken(token string) (*biz.AuthClaims, error) {
 	claims, err := adminauth.Parse(token, i.settings.JWTSettings().SigningKey)
 	if err != nil {
@@ -110,5 +140,7 @@ func (i *tokenIssuer) ParseToken(token string) (*biz.AuthClaims, error) {
 			return nil, biz.ErrTokenInvalid
 		}
 	}
-	return &biz.AuthClaims{UUID: claims.UUID, ID: claims.ID, Username: claims.Username, NickName: claims.NickName, AuthorityID: claims.AuthorityID, UserType: claims.UserType, BufferTime: time.Duration(claims.BufferTime) * time.Second, MustChangePwd: claims.MustChangePwd, Issuer: claims.Issuer, ExpiresAt: claims.ExpiresAt.Time}, nil
+	audience := make([]string, len(claims.Audience))
+	copy(audience, claims.Audience)
+	return &biz.AuthClaims{UUID: claims.UUID, ID: claims.ID, Username: claims.Username, NickName: claims.NickName, AuthorityID: claims.AuthorityID, UserType: claims.UserType, BufferTime: time.Duration(claims.BufferTime) * time.Second, MustChangePwd: claims.MustChangePwd, Issuer: claims.Issuer, Audience: audience, NotBefore: claims.NotBefore.Time, ExpiresAt: claims.ExpiresAt.Time}, nil
 }