idk

tokens.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"errors"
-	"fmt"
 	"strconv"
 	"time"
 
@@ -11,51 +9,45 @@ import (
 
 var secretKey = []byte("replace-with-env-variable")
 
-type UserClaims struct {
-	Name  string  `json:"name"`
-	Color [3]byte `json:"color"`
-	jwt.RegisteredClaims
-}
-
 func GetToken(client *Client) (string, error) {
 	token := jwt.NewWithClaims(jwt.SigningMethodHS256,
-		UserClaims{
-			Name:  client.Name,
-			Color: client.Color,
-			RegisteredClaims: jwt.RegisteredClaims{
-				Subject:   strconv.Itoa(int(client.Id)),
-				ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
-				IssuedAt:  jwt.NewNumericDate(time.Now()),
-			},
+		jwt.RegisteredClaims{
+			Subject:   strconv.Itoa(int(client.Id)),
+			ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Hour)),
+			IssuedAt:  jwt.NewNumericDate(time.Now()),
 		},
 	)
 	return token.SignedString(secretKey)
 }
 
-func SetClientFromToken(client *Client, tokenString string) error {
-	token, err := jwt.ParseWithClaims(tokenString, &UserClaims{}, func(t *jwt.Token) (interface{}, error) {
+func GetDataFromToken(token *string) (uint32, error) {
+	parsed, err := jwt.ParseWithClaims(*token, &jwt.RegisteredClaims{}, func(t *jwt.Token) (any, error) {
 		if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
+			return nil, jwt.ErrSignatureInvalid
 		}
 		return secretKey, nil
 	})
 	if err != nil {
-		return err
+		return 0, err
 	}
 
-	claims, ok := token.Claims.(*UserClaims)
-	if !ok || !token.Valid {
-		return errors.New("invalid token")
+	claims, ok := parsed.Claims.(*jwt.RegisteredClaims)
+	if !ok || !parsed.Valid {
+		return 0, jwt.ErrTokenInvalidClaims
 	}
 
 	id, err := strconv.ParseUint(claims.Subject, 10, 32)
 	if err != nil {
-		return fmt.Errorf("invalid subject: %w", err)
+		return 0, err
 	}
+	return uint32(id), nil
+}
 
-	client.Id = uint32(id)
-	client.Name = claims.Name
-	client.Color = claims.Color
-
+func SetClientFromToken(client *Client, token string) error {
+	id, err := GetDataFromToken(&token)
+	if err != nil {
+		return err
+	}
+	client.Id = id
 	return nil
 }