0.0.3

pkg/token/jwt_maker.go

@@ -24,14 +24,15 @@ func NewJWTMaker(secretKey string) (Maker, error) {
 }
 
 // CreateToken 根据用户名和时间创建一个新的token
-func (maker *JWTMaker) CreateToken(username string, duration time.Duration) (string, error) {
-	payload, err := NewPayload(username, duration)
+func (maker *JWTMaker) CreateToken(id string, username string, duration time.Duration) (string, *Payload, error) {
+	payload, err := NewPayload(id, username, duration)
 	if err != nil {
-		return "", err
+		return "", payload, err
 	}
 
 	jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, payload)
-	return jwtToken.SignedString([]byte(maker.secretKey))
+	token, err := jwtToken.SignedString([]byte(maker.secretKey))
+	return token, payload, err
 }
 
 // VerifyToken checks if the token is valid or not

pkg/token/maker.go

@@ -7,7 +7,7 @@ import (
 // Maker 管理token的接口定义
 type Maker interface {
 	// CreateToken 根据用户名和时间创建一个新的token
-	CreateToken(username string, duration time.Duration) (string, error)
+	CreateToken(id string, username string, duration time.Duration) (string, *Payload, error)
 
 	// VerifyToken 校验token是否正确
 	VerifyToken(token string) (*Payload, error)

pkg/token/paseto_maker.go

@@ -29,13 +29,14 @@ func NewPasetoMaker(symmetricKey string) (Maker, error) {
 }
 
 // CreateToken creates a new token for a specific username and duration
-func (maker *PasetoMaker) CreateToken(username string, duration time.Duration) (string, error) {
-	payload, err := NewPayload(username, duration)
+func (maker *PasetoMaker) CreateToken(id string, username string, duration time.Duration) (string, *Payload, error) {
+	payload, err := NewPayload(id, username, duration)
 	if err != nil {
-		return "", err
+		return "", payload, err
 	}
 
-	return maker.paseto.Encrypt(maker.symmetricKey, payload, nil)
+	token, err := maker.paseto.Encrypt(maker.symmetricKey, payload, nil)
+	return token, payload, err
 }
 
 // VerifyToken checks if the token is valid or not

pkg/token/payload.go

@@ -3,8 +3,6 @@ package token
 import (
 	"errors"
 	"time"
-
-	"github.com/google/uuid"
 )
 
 // Different types of error returned by the VerifyToken function
@@ -15,21 +13,16 @@ var (
 
 // Payload contains the payload data of the token
 type Payload struct {
-	ID        uuid.UUID `json:"id"`
+	ID        string    `json:"id"`
 	Username  string    `json:"username"`
 	IssuedAt  time.Time `json:"issued_at"`
 	ExpiredAt time.Time `json:"expired_at"`
 }
 
 // NewPayload creates a new token payload with a specific username and duration
-func NewPayload(username string, duration time.Duration) (*Payload, error) {
-	tokenID, err := uuid.NewRandom()
-	if err != nil {
-		return nil, err
-	}
-
+func NewPayload(id string, username string, duration time.Duration) (*Payload, error) {
 	payload := &Payload{
-		ID:        tokenID,
+		ID:        id,
 		Username:  username,
 		IssuedAt:  time.Now(),
 		ExpiredAt: time.Now().Add(duration),