Update handlers to work with UUID refresh tokens

- Add parseTokenUUID() helper to convert string to pgtype.UUID
- Update RefreshAccessToken to parse token string to UUID before validation
- Update Logout to parse token string to UUID before revoking
- Update CreateRefreshToken to pass UUID directly to database
- Update auth.go: fix return value order from CreateRefreshToken
- Remove unnecessary comments for cleaner code
This commit is contained in:
2026-01-31 11:44:35 -05:00
parent db5d51e77e
commit d440e55f05
2 changed files with 27 additions and 13 deletions
+25 -11
View File
@@ -3,6 +3,7 @@ package handlers
import (
"bookmann/internal/database"
"context"
"fmt"
"net/http"
"time"
@@ -20,6 +21,14 @@ type RefreshTokenRequest struct {
RefreshToken string `json:"refresh_token" validate:"required"`
}
func parseTokenUUID(tokenStr string) (pgtype.UUID, error) {
tokenUUID, err := uuid.Parse(tokenStr)
if err != nil {
return pgtype.UUID{}, err
}
return pgtype.UUID{Bytes: [16]byte(tokenUUID), Valid: true}, nil
}
type RefreshTokenResponse struct {
AccessToken string `json:"access_token"`
TokenType string `json:"token_type"`
@@ -36,8 +45,12 @@ func (h *AuthHandler) RefreshAccessToken(c echo.Context) error {
return c.JSON(http.StatusBadRequest, map[string]string{"error": err.Error()})
}
// Get refresh token from database
tokenInfo, err := h.db.GetRefreshToken(c.Request().Context(), req.RefreshToken)
tokenUUID, err := parseTokenUUID(req.RefreshToken)
if err != nil {
return c.JSON(http.StatusBadRequest, map[string]string{"error": "invalid refresh token format"})
}
tokenInfo, err := h.db.GetRefreshToken(c.Request().Context(), tokenUUID)
if err != nil {
if err == pgx.ErrNoRows {
return c.JSON(http.StatusUnauthorized, map[string]string{"error": "invalid or expired refresh token"})
@@ -45,7 +58,6 @@ func (h *AuthHandler) RefreshAccessToken(c echo.Context) error {
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to validate refresh token"})
}
// Generate new access token
accessToken, err := h.generateJWTWithAllClaims(
uuid.UUID(tokenInfo.UserID.Bytes).String(),
tokenInfo.Role,
@@ -59,7 +71,7 @@ func (h *AuthHandler) RefreshAccessToken(c echo.Context) error {
return c.JSON(http.StatusOK, RefreshTokenResponse{
AccessToken: accessToken,
TokenType: "Bearer",
ExpiresIn: 3600, // 1 hour in seconds
ExpiresIn: 3600,
})
}
@@ -67,12 +79,15 @@ func (h *AuthHandler) RefreshAccessToken(c echo.Context) error {
func (h *AuthHandler) Logout(c echo.Context) error {
var req RefreshTokenRequest
if err := c.Bind(&req); err != nil {
// If no refresh token provided, just return success
return c.JSON(http.StatusOK, map[string]string{"message": "logged out successfully"})
}
// Revoke the refresh token if provided
err := h.db.RevokeRefreshToken(c.Request().Context(), req.RefreshToken)
tokenUUID, err := parseTokenUUID(req.RefreshToken)
if err != nil {
return c.JSON(http.StatusOK, map[string]string{"message": "logged out successfully"})
}
err = h.db.RevokeRefreshToken(c.Request().Context(), tokenUUID)
if err != nil && err != pgx.ErrNoRows {
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "failed to revoke refresh token"})
}
@@ -82,22 +97,21 @@ func (h *AuthHandler) Logout(c echo.Context) error {
// CreateRefreshToken creates a new refresh token for a user
func (h *AuthHandler) CreateRefreshToken(userID uuid.UUID) (string, string, error) {
// Generate refresh token
tokenUUID := uuid.New()
refreshToken := tokenUUID.String()
// Store in database (plain text for simplicity - tokens are already random UUIDs)
expiresAt := time.Now().Add(refreshTokenExpiration)
_, err := h.db.CreateRefreshToken(context.Background(), database.CreateRefreshTokenParams{
UserID: pgtype.UUID{Bytes: [16]byte(userID), Valid: true},
Token: refreshToken,
Token: pgtype.UUID{Bytes: [16]byte(tokenUUID), Valid: true},
ExpiresAt: pgtype.Timestamptz{Time: expiresAt, Valid: true},
})
if err != nil {
fmt.Printf("ERROR storing refresh token: %v\n", err)
return "", "", err
}
fmt.Printf("DEBUG: refreshToken generated: '%s'\n", refreshToken)
// Generate new access token
accessToken, err := h.generateJWT(userID.String())
if err != nil {
return "", "", err