From a8c974994b91ec1cc12bbd3766793956af381b7c Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Wed, 10 Sep 2025 19:26:54 +0300
Subject: [PATCH] removed session id from access token

---
 internal/interfaces/jwtProvider.go |  2 +-
 internal/provider/token/service.go | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/internal/interfaces/jwtProvider.go b/internal/interfaces/jwtProvider.go
index fcfc1aa..66e9a48 100644
--- a/internal/interfaces/jwtProvider.go
+++ b/internal/interfaces/jwtProvider.go
@@ -8,5 +8,5 @@ import (
 type JWTProvider interface {
 	CreateAccessToken(userUuid, sessionUuid string) (string, error)
 	CreateRefreshToken(refreshUuid string, expires time.Time) *http.Cookie
-	Parse(token string) (string, string, error)
+	Parse(token string) (string, error)
 }
diff --git a/internal/provider/token/service.go b/internal/provider/token/service.go
index f7cb63c..0bb68c5 100644
--- a/internal/provider/token/service.go
+++ b/internal/provider/token/service.go
@@ -65,7 +65,7 @@ func (j *JWT) CreateRefreshToken(refreshUuid string, expires time.Time) *http.Co
 	}
 }
 
-func (j *JWT) Parse(token string) (string, string, error) {
+func (j *JWT) Parse(token string) (string, error) {
 	if strings.HasPrefix(token, "Bearer ") {
 		token = strings.TrimPrefix(token, "Bearer ")
 	}
@@ -78,25 +78,16 @@ func (j *JWT) Parse(token string) (string, string, error) {
 	})
 	if err != nil {
 		log.Error(err)
-		return "", "", err
+		return "", err
 	}
 
 	if claims, ok := parse.Claims.(jwt.MapClaims); ok && parse.Valid {
 		userUuid := claims["sub"].(string)
 
-		var sessionUuid string
-		if sid, exists := claims["sid"]; exists {
-			if tknStr, okay := sid.(string); okay {
-				sessionUuid = tknStr
-			} else {
-				return "", "", fmt.Errorf("invalid type for 'sid' claim")
-			}
-		}
-
-		return userUuid, sessionUuid, nil
+		return userUuid, nil
 	}
 
-	return "", "", fmt.Errorf("invalid token")
+	return "", fmt.Errorf("invalid token")
 }
 
 func duration(minutes string) time.Duration {