mirror of
https://github.com/SamyRai/tercul-backend.git
synced 2025-12-27 02:51:34 +00:00
781b313bf1
This commit addresses all the high-priority tasks outlined in the TASKS.md file, significantly improving the application's observability, completing key features, and refactoring critical parts of the codebase. ### Observability - **Centralized Logging:** Implemented a new structured, context-aware logging system using `zerolog`. A new logging middleware injects request-specific information (request ID, user ID, trace ID) into the logger, and all application logging has been refactored to use this new system. - **Prometheus Metrics:** Added Prometheus metrics for database query performance by creating a GORM plugin that automatically records query latency and totals. - **OpenTelemetry Tracing:** Fully instrumented all application services in `internal/app` and data repositories in `internal/data/sql` with OpenTelemetry tracing, providing deep visibility into application performance. ### Features - **Analytics:** Implemented like, comment, and bookmark counting. The respective command handlers now call the analytics service to increment counters when these actions are performed. - **Enrichment Tool:** Built a new, extensible `enrich` command-line tool to fetch data from external sources. The initial implementation enriches author data using the Open Library API. ### Refactoring & Fixes - **Decoupled Testing:** Refactored the testing utilities in `internal/testutil` to be database-agnostic, promoting the use of mock-based unit tests and improving test speed and reliability. - **Build Fixes:** Resolved numerous build errors, including a critical import cycle between the logging, observability, and authentication packages. - **Search Service:** Fixed the search service integration by implementing the `GetWorkContent` method in the localization service, allowing the search indexer to correctly fetch and index work content.
106 lines
2.7 KiB
Go
106 lines
2.7 KiB
Go
package auth
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"tercul/internal/domain"
|
|
"tercul/internal/platform/auth"
|
|
"tercul/internal/platform/log"
|
|
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
var (
|
|
ErrUserNotFound = errors.New("user not found")
|
|
ErrContextRequired = errors.New("context is required")
|
|
)
|
|
|
|
// AuthQueries contains the query handlers for authentication.
|
|
type AuthQueries struct {
|
|
userRepo domain.UserRepository
|
|
jwtManager auth.JWTManagement
|
|
tracer trace.Tracer
|
|
}
|
|
|
|
// NewAuthQueries creates a new AuthQueries handler.
|
|
func NewAuthQueries(userRepo domain.UserRepository, jwtManager auth.JWTManagement) *AuthQueries {
|
|
return &AuthQueries{
|
|
userRepo: userRepo,
|
|
jwtManager: jwtManager,
|
|
tracer: otel.Tracer("auth.queries"),
|
|
}
|
|
}
|
|
|
|
// GetUserFromContext extracts user from context
|
|
func (q *AuthQueries) GetUserFromContext(ctx context.Context) (*domain.User, error) {
|
|
if ctx == nil {
|
|
return nil, ErrContextRequired
|
|
}
|
|
ctx, span := q.tracer.Start(ctx, "GetUserFromContext")
|
|
defer span.End()
|
|
logger := log.FromContext(ctx)
|
|
logger.Debug("Attempting to get user from context")
|
|
|
|
claims, err := auth.RequireAuth(ctx)
|
|
if err != nil {
|
|
logger.Warn("Failed to get user from context - authentication required")
|
|
return nil, err
|
|
}
|
|
logger = logger.With("user_id", claims.UserID)
|
|
logger.Debug("Claims found in context")
|
|
|
|
user, err := q.userRepo.GetByID(ctx, claims.UserID)
|
|
if err != nil {
|
|
logger.Warn("Failed to get user from context - user not found")
|
|
return nil, ErrUserNotFound
|
|
}
|
|
|
|
if !user.Active {
|
|
logger.Warn("Failed to get user from context - user inactive")
|
|
return nil, ErrInvalidCredentials
|
|
}
|
|
|
|
logger.Debug("User retrieved from context successfully")
|
|
return user, nil
|
|
}
|
|
|
|
// ValidateToken validates a JWT token and returns the user
|
|
func (q *AuthQueries) ValidateToken(ctx context.Context, tokenString string) (*domain.User, error) {
|
|
if ctx == nil {
|
|
return nil, ErrContextRequired
|
|
}
|
|
ctx, span := q.tracer.Start(ctx, "ValidateToken")
|
|
defer span.End()
|
|
logger := log.FromContext(ctx)
|
|
|
|
if tokenString == "" {
|
|
logger.Warn("Token validation failed - empty token")
|
|
return nil, auth.ErrMissingToken
|
|
}
|
|
logger.Debug("Attempting to validate token")
|
|
|
|
claims, err := q.jwtManager.ValidateToken(tokenString)
|
|
if err != nil {
|
|
logger.Error(err, "Token validation failed - invalid token")
|
|
return nil, err
|
|
}
|
|
|
|
logger = logger.With("user_id", claims.UserID)
|
|
logger.Debug("Token claims validated")
|
|
|
|
user, err := q.userRepo.GetByID(ctx, claims.UserID)
|
|
if err != nil {
|
|
logger.Error(err, "Token validation failed - user not found")
|
|
return nil, ErrUserNotFound
|
|
}
|
|
|
|
if !user.Active {
|
|
logger.Warn("Token validation failed - user inactive")
|
|
return nil, ErrInvalidCredentials
|
|
}
|
|
|
|
logger.Info("Token validated successfully")
|
|
return user, nil
|
|
}
|