mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-05 23:44:22 +00:00
Add logging to auth package
This commit is contained in:
@@ -3,12 +3,17 @@ package auth
|
||||
import (
|
||||
"fmt"
|
||||
"novamd/internal/db"
|
||||
"novamd/internal/logging"
|
||||
"novamd/internal/models"
|
||||
"time"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func getSessionLogger() logging.Logger {
|
||||
return getAuthLogger().WithGroup("session")
|
||||
}
|
||||
|
||||
// SessionManager is an interface for managing user sessions
|
||||
type SessionManager interface {
|
||||
CreateSession(userID int, role string) (*models.Session, string, error)
|
||||
@@ -27,6 +32,9 @@ type sessionManager struct {
|
||||
// NewSessionService creates a new session service with the given database and JWT manager
|
||||
// revive:disable:unexported-return
|
||||
func NewSessionService(db db.SessionStore, jwtManager JWTManager) *sessionManager {
|
||||
log := getSessionLogger()
|
||||
log.Info("initialized session manager")
|
||||
|
||||
return &sessionManager{
|
||||
db: db,
|
||||
jwtManager: jwtManager,
|
||||
@@ -35,6 +43,7 @@ func NewSessionService(db db.SessionStore, jwtManager JWTManager) *sessionManage
|
||||
|
||||
// CreateSession creates a new user session for a user with the given userID and role
|
||||
func (s *sessionManager) CreateSession(userID int, role string) (*models.Session, string, error) {
|
||||
log := getSessionLogger()
|
||||
|
||||
// Generate a new session ID
|
||||
sessionID := uuid.New().String()
|
||||
@@ -70,11 +79,19 @@ func (s *sessionManager) CreateSession(userID int, role string) (*models.Session
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
log.Debug("created new session",
|
||||
"userId", userID,
|
||||
"role", role,
|
||||
"sessionId", sessionID,
|
||||
"expiresAt", claims.ExpiresAt.Time)
|
||||
|
||||
return session, accessToken, nil
|
||||
}
|
||||
|
||||
// RefreshSession creates a new access token using a refreshToken
|
||||
func (s *sessionManager) RefreshSession(refreshToken string) (string, error) {
|
||||
log := getSessionLogger()
|
||||
|
||||
// Get session from database first
|
||||
session, err := s.db.GetSessionByRefreshToken(refreshToken)
|
||||
if err != nil {
|
||||
@@ -93,11 +110,22 @@ func (s *sessionManager) RefreshSession(refreshToken string) (string, error) {
|
||||
}
|
||||
|
||||
// Generate a new access token
|
||||
return s.jwtManager.GenerateAccessToken(claims.UserID, claims.Role, session.ID)
|
||||
newToken, err := s.jwtManager.GenerateAccessToken(claims.UserID, claims.Role, session.ID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
log.Debug("refreshed session",
|
||||
"userId", claims.UserID,
|
||||
"role", claims.Role,
|
||||
"sessionId", session.ID)
|
||||
|
||||
return newToken, nil
|
||||
}
|
||||
|
||||
// ValidateSession checks if a session with the given sessionID is valid
|
||||
func (s *sessionManager) ValidateSession(sessionID string) (*models.Session, error) {
|
||||
log := getSessionLogger()
|
||||
|
||||
// Get the session from the database
|
||||
session, err := s.db.GetSessionByID(sessionID)
|
||||
@@ -105,21 +133,43 @@ func (s *sessionManager) ValidateSession(sessionID string) (*models.Session, err
|
||||
return nil, fmt.Errorf("failed to get session: %w", err)
|
||||
}
|
||||
|
||||
log.Debug("validated session",
|
||||
"sessionId", sessionID,
|
||||
"userId", session.UserID,
|
||||
"expiresAt", session.ExpiresAt)
|
||||
|
||||
return session, nil
|
||||
}
|
||||
|
||||
// InvalidateSession removes a session with the given sessionID from the database
|
||||
func (s *sessionManager) InvalidateSession(token string) error {
|
||||
log := getSessionLogger()
|
||||
|
||||
// Parse the JWT to get the session info
|
||||
claims, err := s.jwtManager.ValidateToken(token)
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid token: %w", err)
|
||||
}
|
||||
|
||||
return s.db.DeleteSession(claims.ID)
|
||||
if err := s.db.DeleteSession(claims.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Debug("invalidated session",
|
||||
"sessionId", claims.ID,
|
||||
"userId", claims.UserID)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// CleanExpiredSessions removes all expired sessions from the database
|
||||
func (s *sessionManager) CleanExpiredSessions() error {
|
||||
return s.db.CleanExpiredSessions()
|
||||
log := getSessionLogger()
|
||||
|
||||
if err := s.db.CleanExpiredSessions(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Info("cleaned expired sessions")
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user