Merge pull request #2 from anfen93/ft/add-payload-to-maker

added Payload to CreateToken return values

Author: anfen93

.github/workflows/go.yml .github/workflows/test.yml.github/workflows/go.yml renamed to .github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Go
+name: Test
 
 on:
   push:

maker.go

@@ -5,7 +5,7 @@ import "time"
 // Maker is an interface for managing tokens
 type Maker interface {
 	// CreateToken creates a new token for a specific username and duration
-	CreateToken(username string, duration time.Duration) (string, error)
+	CreateToken(username string, duration time.Duration) (string, *Payload, error)
 
 	// VerifyToken checks if the provided token is valid or not
 	VerifyToken(token string) (*Payload, error)

paseto_maker.go

@@ -38,29 +38,36 @@ func NewPasetoMaker() Maker {
 }
 
 // CreateToken generates a new Paseto token for a given username and duration.
-// It returns an encrypted token string or an error if the token generation fails.
-func (maker *PasetoMaker) CreateToken(username string, duration time.Duration) (string, error) {
+// It returns an encrypted token string and the Payload struct, or an error if the token generation fails.
+func (maker *PasetoMaker) CreateToken(username string, duration time.Duration) (string, *Payload, error) {
 
 	token := paseto.NewToken() // Initializes a new Paseto token
 
 	tokenID, err := uuid.NewRandom() // Generates a unique identifier for the token
 	if err != nil {
-		return "", err // Returns an error if the token generation fails
+		return "", nil, err // Returns an error if the token generation fails
 	}
+
 	// Adding necessary data to the token
 	err = token.Set("id", tokenID.String())
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 	err = token.Set("username", username)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 	// Setting issued at and expiration times for the token
 	token.SetIssuedAt(time.Now())
 	token.SetExpiration(time.Now().Add(duration))
 	// Encrypts and returns the token
-	return token.V4Encrypt(maker.symmetricKey, maker.implicit), nil
+
+	encryptedToken := token.V4Encrypt(maker.symmetricKey, maker.implicit)
+	payload, err := getPayloadFromToken(&token)
+	if err != nil {
+		return "", nil, err // Returns an error if the token generation fails
+	}
+	return encryptedToken, payload, nil
 }
 
 // VerifyToken checks the validity of a provided Paseto token. It returns a Payload

paseto_maker_test.go

@@ -14,11 +14,12 @@ func TestPasetoMakerTokenLifecycle(t *testing.T) {
 	username := "testuser"
 	duration := time.Minute
 
-	token, err := maker.CreateToken(username, duration)
+	token, payload, err := maker.CreateToken(username, duration)
 	require.NoError(t, err, "Token creation should not error")
 	require.NotEmpty(t, token, "Token should not be empty")
+	require.NotEmpty(t, payload, "Payload should not be empty")
 
-	payload, err := maker.VerifyToken(token)
+	payload, err = maker.VerifyToken(token)
 	require.NoError(t, err, "Token verification should not error")
 	require.NotEmpty(t, payload, "Payload should not be empty")
 
@@ -33,11 +34,11 @@ func TestPasetoMakerExpiredToken(t *testing.T) {
 	maker := NewPasetoMaker()
 	require.NotNil(t, maker, "Maker should not be nil")
 
-	token, err := maker.CreateToken("expireduser", -time.Minute)
+	token, payload, err := maker.CreateToken("expireduser", -time.Minute)
 	require.NoError(t, err, "Expired token creation should not error")
 	require.NotEmpty(t, token, "Expired token should not be empty")
 
-	payload, err := maker.VerifyToken(token)
+	payload, err = maker.VerifyToken(token)
 	require.Error(t, err, "Expired token verification should error")
 	require.EqualError(t, err, ErrExpiredToken.Error(), "Error should be ErrExpiredToken")
 	require.Nil(t, payload, "Payload should be nil for an expired token")