From 66b4b0e17338b8ac2aca278fc6f059c9ce436660 Mon Sep 17 00:00:00 2001 From: Kharec Date: Sat, 10 Jan 2026 22:47:10 +0100 Subject: [PATCH] refactor: use AuthResponseDTO instead of services.AuthResult --- internal/handlers/auth_handler.go | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/internal/handlers/auth_handler.go b/internal/handlers/auth_handler.go index 1159b1a..b1e2fe6 100644 --- a/internal/handlers/auth_handler.go +++ b/internal/handlers/auth_handler.go @@ -44,26 +44,6 @@ type AuthHandler struct { type AuthResponse = CommonResponse -type AuthTokensResponse struct { - Success bool `json:"success" example:"true"` - Message string `json:"message" example:"Authentication successful"` - Data AuthTokensDetail `json:"data"` -} - -type AuthTokensDetail struct { - AccessToken string `json:"access_token" example:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."` - RefreshToken string `json:"refresh_token" example:"f94d4ddc7d9b4fcb9d3a2c44c400b780c3e1f1a5c2b7d4e6a0b1c2d3e4f5a6b7"` - User AuthUserSummary `json:"user"` -} - -type AuthUserSummary struct { - ID uint `json:"id" example:"42"` - Username string `json:"username" example:"janedoe"` - Email string `json:"email" example:"jane@example.com"` - EmailVerified bool `json:"email_verified" example:"true"` - Locked bool `json:"locked" example:"false"` -} - func NewAuthHandler(authService AuthServiceInterface, userRepo repositories.UserRepository) *AuthHandler { return &AuthHandler{ authService: authService, @@ -77,7 +57,7 @@ func NewAuthHandler(authService AuthServiceInterface, userRepo repositories.User // @Accept json // @Produce json // @Param request body dto.LoginRequest true "Login credentials" -// @Success 200 {object} AuthTokensResponse "Authentication successful" +// @Success 200 {object} AuthResponse "Authentication successful" // @Failure 400 {object} AuthResponse "Invalid request data or validation failed" // @Failure 401 {object} AuthResponse "Invalid credentials" // @Failure 403 {object} AuthResponse "Account is locked" @@ -98,7 +78,8 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) { return } - SendSuccessResponse(w, "Authentication successful", result) + responseDTO := dto.ToAuthResponseDTO(result) + SendSuccessResponse(w, "Authentication successful", responseDTO) } // @Summary Register a new user @@ -542,7 +523,7 @@ func (h *AuthHandler) Logout(w http.ResponseWriter, r *http.Request) { // @Accept json // @Produce json // @Param request body dto.RefreshTokenRequest true "Refresh token data" -// @Success 200 {object} AuthTokensResponse "Token refreshed successfully" +// @Success 200 {object} AuthResponse "Token refreshed successfully" // @Failure 400 {object} AuthResponse "Invalid request body or missing refresh token" // @Failure 401 {object} AuthResponse "Invalid or expired refresh token" // @Failure 403 {object} AuthResponse "Account is locked" @@ -565,7 +546,8 @@ func (h *AuthHandler) RefreshToken(w http.ResponseWriter, r *http.Request) { return } - SendSuccessResponse(w, "Token refreshed successfully", result) + responseDTO := dto.ToAuthResponseDTO(result) + SendSuccessResponse(w, "Token refreshed successfully", responseDTO) } // @Summary Revoke refresh token