use uuid for everything

This commit is contained in:
2026-04-12 14:19:46 +02:00
parent 18ebfd0416
commit 3be9619cca
9 changed files with 72 additions and 68 deletions
+11 -11
View File
@@ -2,26 +2,26 @@ package main
import (
"fmt"
"strconv"
"time"
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"
)
const tokenSecret = "tmp" // TODO delete in production
const tokenExpiration = time.Hour
func TokenCreate(userId uint32) (string, error) {
func TokenCreate(userId uuid.UUID) (string, error) {
now := time.Now()
signedToken, err := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.RegisteredClaims{
Subject: strconv.FormatUint(uint64(userId), 10),
Subject: userId.String(),
IssuedAt: jwt.NewNumericDate(now),
ExpiresAt: jwt.NewNumericDate(now.Add(tokenExpiration)),
}).SignedString([]byte(tokenSecret))
return signedToken, err
}
func TokenValidateGetId(tokenString string) (uint32, error) {
func TokenValidateGetId(tokenString string) (uuid.UUID, error) {
token, err := jwt.Parse(tokenString, func(t *jwt.Token) (interface{}, error) {
if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
@@ -29,28 +29,28 @@ func TokenValidateGetId(tokenString string) (uint32, error) {
return []byte(tokenSecret), nil
})
if err != nil {
return 0, err
return uuid.UUID{}, err
}
claims, ok := token.Claims.(jwt.MapClaims)
if !ok || !token.Valid {
return 0, fmt.Errorf("invalid token")
return uuid.UUID{}, fmt.Errorf("invalid token")
}
exp, ok := claims["exp"].(float64)
if !ok || time.Now().Unix() > int64(exp) {
return 0, fmt.Errorf("token expired")
return uuid.UUID{}, fmt.Errorf("token expired")
}
sub, ok := claims["sub"].(string)
if !ok {
return 0, fmt.Errorf("invalid subject claim")
return uuid.UUID{}, fmt.Errorf("invalid subject claim")
}
id, err := strconv.ParseUint(sub, 10, 32)
id, err := uuid.Parse(sub)
if err != nil {
return 0, fmt.Errorf("invalid subject claim")
return uuid.UUID{}, fmt.Errorf("invalid subject claim")
}
return uint32(id), nil
return id, nil
}