This commit is contained in:
@@ -11,7 +11,6 @@ import (
|
||||
)
|
||||
|
||||
type Claims struct {
|
||||
Sub string `json:"sub"`
|
||||
Type string `json:"type"`
|
||||
jwt.RegisteredClaims
|
||||
}
|
||||
@@ -19,9 +18,9 @@ type Claims struct {
|
||||
func GenerateAccessToken(userID int, secret string) (string, error) {
|
||||
now := time.Now()
|
||||
claims := Claims{
|
||||
Sub: strconv.Itoa(userID),
|
||||
Type: "access",
|
||||
RegisteredClaims: jwt.RegisteredClaims{
|
||||
Subject: strconv.Itoa(userID),
|
||||
ID: uuid.New().String(),
|
||||
IssuedAt: jwt.NewNumericDate(now),
|
||||
ExpiresAt: jwt.NewNumericDate(now.Add(15 * time.Minute)),
|
||||
@@ -35,9 +34,9 @@ func GenerateAccessToken(userID int, secret string) (string, error) {
|
||||
func GenerateRefreshToken(userID int, secret string) (string, error) {
|
||||
now := time.Now()
|
||||
claims := Claims{
|
||||
Sub: strconv.Itoa(userID),
|
||||
Type: "refresh",
|
||||
RegisteredClaims: jwt.RegisteredClaims{
|
||||
Subject: strconv.Itoa(userID),
|
||||
ID: uuid.New().String(),
|
||||
IssuedAt: jwt.NewNumericDate(now),
|
||||
ExpiresAt: jwt.NewNumericDate(now.Add(30 * 24 * time.Hour)),
|
||||
@@ -73,7 +72,7 @@ func GetUserIDFromToken(tokenString, secret string) (int, error) {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
userID, err := strconv.Atoi(claims.Sub)
|
||||
userID, err := strconv.Atoi(claims.Subject)
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("invalid user ID in token: %w", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user