✨ return token UUID as part of API response

Author: linkdd

api/create_token.go

@@ -13,8 +13,9 @@ import (
 type CreateTokenRequest struct{}
 
 type CreateTokenResponse struct {
-	Success bool   `json:"success"`
-	Token   string `json:"token"`
+	Success   bool   `json:"success"`
+	Token     string `json:"token"`
+	TokenUUID string `json:"token-uuid"`
 }
 
 func CreateTokenUsecase(authDb *auth.Database) usecase.Interactor {
@@ -28,7 +29,7 @@ func CreateTokenUsecase(authDb *auth.Database) usecase.Interactor {
 		) error {
 			user := auth.GetContextUser(ctx)
 
-			token, err := tokenSys.CreateToken(user.Name)
+			token, tokenUuid, err := tokenSys.CreateToken(user.Name)
 			if err != nil {
 				slog.ErrorContext(
 					ctx,
@@ -44,6 +45,7 @@ func CreateTokenUsecase(authDb *auth.Database) usecase.Interactor {
 
 			resp.Success = true
 			resp.Token = token
+			resp.TokenUUID = tokenUuid
 
 			return nil
 		},

cmd/flowg/admin_token_create.go

@@ -54,7 +54,7 @@ func NewAdminTokenCreateCommand() *cobra.Command {
 				return
 			}
 
-			token, err := tokenSys.CreateToken(user.Name)
+			token, _, err := tokenSys.CreateToken(user.Name)
 			if err != nil {
 				fmt.Fprintln(os.Stderr, "ERROR: Failed to generate token:", err)
 				exitCode = 1

internal/data/auth/system_token.go

@@ -21,17 +21,19 @@ func NewTokenSystem(backend *Database) *TokenSystem {
 	return &TokenSystem{backend: backend}
 }
 
-func (sys *TokenSystem) CreateToken(username string) (string, error) {
+func (sys *TokenSystem) CreateToken(username string) (string, string, error) {
 	token, err := newToken(32)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
 	tokenHash, err := hash.HashPassword(token)
 	if err != nil {
-		return "", fmt.Errorf("failed to hash token: %w", err)
+		return "", "", fmt.Errorf("failed to hash token: %w", err)
 	}
 
+	tokenUuid := uuid.New().String()
+
 	err = sys.backend.db.Update(func(txn *badger.Txn) error {
 		userKey := []byte(fmt.Sprintf("index:user:%s", username))
 		_, err := txn.Get(userKey)
@@ -43,7 +45,7 @@ func (sys *TokenSystem) CreateToken(username string) (string, error) {
 			return fmt.Errorf("failed to check if user '%s' exists: %w", username, err)
 		}
 
-		tokenKey := []byte(fmt.Sprintf("pat:%s:%s", username, uuid.New().String()))
+		tokenKey := []byte(fmt.Sprintf("pat:%s:%s", username, tokenUuid))
 		err = txn.Set(tokenKey, []byte(tokenHash))
 		if err != nil {
 			return fmt.Errorf("failed to add token to user '%s': %w", username, err)
@@ -53,10 +55,10 @@ func (sys *TokenSystem) CreateToken(username string) (string, error) {
 	})
 
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
-	return token, nil
+	return token, tokenUuid, nil
 }
 
 func (sys *TokenSystem) VerifyToken(token string) (*User, error) {

web/apps/account/controllers/create_token.go

@@ -21,7 +21,7 @@ func CreateToken(
 		r = r.WithContext(webutils.WithNotificationSystem(r.Context()))
 
 		user := auth.GetContextUser(r.Context())
-		token, err := tokenSys.CreateToken(user.Name)
+		token, _, err := tokenSys.CreateToken(user.Name)
 		if err != nil {
 			webutils.LogError(r.Context(), "Failed to create token", err)
 			webutils.NotifyError(r.Context(), "Could not create token")