From ccf2f3d15771445440ea5c55975b704cda116d7a Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <iam@allanger.xyz>
Date: Mon, 18 May 2026 14:20:29 +0200
Subject: [PATCH] Update the auth controller

Signed-off-by: Nikolai Rodionov <iam@allanger.xyz>
---
 internal/cache/cache.go               |  7 +++++-
 internal/controllers/authorization.go | 35 ++++++++++++++++-----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/internal/cache/cache.go b/internal/cache/cache.go
index 3a44805..d2707db 100644
--- a/internal/cache/cache.go
+++ b/internal/cache/cache.go
@@ -9,7 +9,8 @@ import (
 )
 
 const (
-	CacheFolderToken = "token"
+	CacheFolderToken    = "token"
+	CacheFolderSessions = "session"
 )
 
 func buildKey(folder, key string) string {
@@ -23,3 +24,7 @@ func GetFromCache(ctx context.Context, redis *redis.Client, folder, key string)
 func SaveToCache(ctx context.Context, redis *redis.Client, folder, key, value string, ttl time.Duration) error {
 	return redis.Set(ctx, buildKey(folder, key), value, ttl).Err()
 }
+
+func DeleteFromCache(ctx context.Context, redis *redis.Client, folder, key string) error {
+	return redis.Del(ctx, buildKey(folder, key)).Err()
+}
diff --git a/internal/controllers/authorization.go b/internal/controllers/authorization.go
index 430058d..31da861 100644
--- a/internal/controllers/authorization.go
+++ b/internal/controllers/authorization.go
@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/cache"
+	"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/helpers/logger"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth"
@@ -30,6 +32,7 @@ const (
 var (
 	ErrUnknownTokenType = errors.New("token type unknown")
 	ErrInvalidToken     = errors.New("invalid token")
+	ErrSessionNotFound  = errors.New("session not found")
 )
 
 type Claims struct {
@@ -193,31 +196,35 @@ type Session struct {
 	UserID string `json:"user_id"`
 }
 
-func redisSessionKey(input string) string {
-	return fmt.Sprintf("session:%s", input)
-}
-
 func (a *AuthController) SaveSession(ctx context.Context, tokenID string, session *Session) error {
-	sessionJson, err := json.Marshal(session)
+	log := logger.FromContext(ctx)
+	sessionJSON, err := json.Marshal(session)
 	if err != nil {
-		return err
+		log.Error(err, "Couldn't marshal a session into json")
+		return ErrServerError
 	}
-
-	if err := a.redis.Set(ctx, redisSessionKey(tokenID), string(sessionJson), a.refreshTTL).Err(); err != nil {
-		return err
+	if err := cache.SaveToCache(ctx, a.redis, cache.CacheFolderSessions, tokenID, string(sessionJSON), a.refreshTTL); err != nil {
+		log.Error(err, "Couldn't save the session")
+		return ErrServerError
 	}
-
 	return nil
 }
 
 func (a *AuthController) GetSession(ctx context.Context, tokenID string) (*Session, error) {
-	sessionRaw := a.redis.Get(ctx, redisSessionKey(tokenID)).Val()
-	if err := a.redis.Del(ctx, redisSessionKey(tokenID)).Err(); err != nil {
-		return nil, err
+	log := logger.FromContext(ctx)
+	sessionRaw := cache.GetFromCache(ctx, a.redis, cache.CacheFolderSessions, tokenID)
+	if sessionRaw == "" {
+		return nil, ErrSessionNotFound
 	}
+	if err := cache.DeleteFromCache(ctx, a.redis, cache.CacheFolderSessions, tokenID); err != nil {
+		// Just log an error
+		log.Error(err, "Couldn't remove a session from the cache")
+	}
+
 	session := &Session{}
 	if err := json.Unmarshal([]byte(sessionRaw), session); err != nil {
-		return nil, err
+		return nil, ErrServerError
 	}
+
 	return session, nil
 }