new start

tokens.go

@@ -1,44 +1,56 @@
 package main
 
 import (
+	"fmt"
 	"strconv"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"
 )
 
-var secretKey = []byte("replace-with-env-variable")
+const tokenSecret = "tmp" // TODO delete in production
+const tokenExpiration = time.Hour
 
-func GetToken(clientId uint32) (string, error) {
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256,
-		jwt.RegisteredClaims{
-			Subject:   strconv.Itoa(int(clientId)),
-			ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
-			IssuedAt:  jwt.NewNumericDate(time.Now()),
-		},
-	)
-	return token.SignedString(secretKey)
+func TokenCreate(clientId uint32) (string, error) {
+	now := time.Now()
+	signedToken, err := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.RegisteredClaims{
+		Subject:   strconv.FormatUint(uint64(clientId), 10),
+		IssuedAt:  jwt.NewNumericDate(now),
+		ExpiresAt: jwt.NewNumericDate(now.Add(tokenExpiration)),
+	}).SignedString([]byte(tokenSecret))
+	return signedToken, err
 }
 
-func GetClientIdFromToken(token string) (uint32, error) {
-	parsed, err := jwt.ParseWithClaims(token, &jwt.RegisteredClaims{}, func(t *jwt.Token) (any, error) {
+func TokenValidateGetId(tokenString string) (uint32, error) {
+	token, err := jwt.Parse(tokenString, func(t *jwt.Token) (interface{}, error) {
 		if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, jwt.ErrSignatureInvalid
+			return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
 		}
-		return secretKey, nil
+		return []byte(tokenSecret), nil
 	})
 	if err != nil {
 		return 0, err
 	}
 
-	claims, ok := parsed.Claims.(*jwt.RegisteredClaims)
-	if !ok || !parsed.Valid {
-		return 0, jwt.ErrTokenInvalidClaims
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok || !token.Valid {
+		return 0, fmt.Errorf("invalid token")
 	}
 
-	id, err := strconv.ParseUint(claims.Subject, 10, 32)
-	if err != nil {
-		return 0, err
+	exp, ok := claims["exp"].(float64)
+	if !ok || time.Now().Unix() > int64(exp) {
+		return 0, fmt.Errorf("token expired")
 	}
+
+	sub, ok := claims["sub"].(string)
+	if !ok {
+		return 0, fmt.Errorf("invalid subject claim")
+	}
+
+	id, err := strconv.ParseUint(sub, 10, 32)
+	if err != nil {
+		return 0, fmt.Errorf("invalid subject claim")
+	}
+
 	return uint32(id), nil
 }