feat: Update JWT token generation to set cookie and modify authentication middleware to use cookie

This commit is contained in:
Jean Jacques Avril 2025-03-11 17:14:55 +00:00
parent 728258caa7
commit 165432208c
3 changed files with 11 additions and 18 deletions

View File

@ -246,7 +246,7 @@ func (h *UserHandler) Login(c *gin.Context) {
} }
// Generate JWT token // Generate JWT token
token, err := middleware.GenerateToken(user) token, err := middleware.GenerateToken(user, c)
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error generating token: "+err.Error()) utils.InternalErrorResponse(c, "Error generating token: "+err.Error())
return return
@ -292,7 +292,7 @@ func (h *UserHandler) Register(c *gin.Context) {
} }
// Generate JWT token // Generate JWT token
token, err := middleware.GenerateToken(user) token, err := middleware.GenerateToken(user, c)
if err != nil { if err != nil {
utils.InternalErrorResponse(c, "Error generating token: "+err.Error()) utils.InternalErrorResponse(c, "Error generating token: "+err.Error())
return return

View File

@ -2,7 +2,6 @@ package middleware
import ( import (
"errors" "errors"
"strings"
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -31,23 +30,14 @@ type Claims struct {
// AuthMiddleware checks if the user is authenticated // AuthMiddleware checks if the user is authenticated
func AuthMiddleware() gin.HandlerFunc { func AuthMiddleware() gin.HandlerFunc {
return func(c *gin.Context) { return func(c *gin.Context) {
// Get the Authorization header // Get the token from cookie
authHeader := c.GetHeader("Authorization") tokenString, err := c.Cookie("jwt")
if authHeader == "" { if err != nil {
utils.UnauthorizedResponse(c, "Authorization header is required") utils.UnauthorizedResponse(c, "Authentication cookie is required")
c.Abort() c.Abort()
return return
} }
// Check if the header has the Bearer prefix
parts := strings.Split(authHeader, " ")
if len(parts) != 2 || parts[0] != "Bearer" {
utils.UnauthorizedResponse(c, "Invalid authorization format, expected 'Bearer TOKEN'")
c.Abort()
return
}
tokenString := parts[1]
claims, err := validateToken(tokenString) claims, err := validateToken(tokenString)
if err != nil { if err != nil {
utils.UnauthorizedResponse(c, "Invalid or expired token") utils.UnauthorizedResponse(c, "Invalid or expired token")
@ -102,7 +92,7 @@ func RoleMiddleware(roles ...string) gin.HandlerFunc {
} }
// GenerateToken creates a new JWT token for a user // GenerateToken creates a new JWT token for a user
func GenerateToken(user *models.User) (string, error) { func GenerateToken(user *models.User, c *gin.Context) (string, error) {
// Create the claims // Create the claims
claims := Claims{ claims := Claims{
UserID: user.ID.String(), UserID: user.ID.String(),
@ -125,6 +115,9 @@ func GenerateToken(user *models.User) (string, error) {
return "", err return "", err
} }
// Set the cookie
c.SetCookie("jwt", tokenString, int(tokenDuration.Seconds()), "/", "", true, true)
return tokenString, nil return tokenString, nil
} }

View File

@ -28,7 +28,7 @@ func SetupRouter(r *gin.Engine) {
// Protected routes // Protected routes
protected := api.Group("") protected := api.Group("")
//protected.Use(middleware.AuthMiddleware()) protected.Use(middleware.AuthMiddleware())
{ {
// Auth routes (protected) // Auth routes (protected)
protectedAuth := protected.Group("/auth") protectedAuth := protected.Group("/auth")