From ec43c3bcca50c1ada0490a2a025a09d2ca883781 Mon Sep 17 00:00:00 2001 From: Isaque Veras Date: Sun, 5 Nov 2023 21:46:12 -0300 Subject: [PATCH] fix: replace user_uuid to user_id --- delivery/http/auth/handler.go | 16 ++++++++-------- delivery/http/auth/handler_test.go | 2 +- delivery/http/auth/router.go | 2 +- middleware/auth.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/delivery/http/auth/handler.go b/delivery/http/auth/handler.go index 8b246d4..e3ec203 100644 --- a/delivery/http/auth/handler.go +++ b/delivery/http/auth/handler.go @@ -107,9 +107,9 @@ func loginSteps(ctx *gin.Context) { ctx.JSON(http.StatusOK, res) } -// @Router /v1/auth/user/{user_uuid}/disable [PUT] +// @Router /v1/auth/user/{user_id}/disable [PUT] func disable(ctx *gin.Context) { - userID, err := uuid.Parse(ctx.Param("user_uuid")) + userID, err := uuid.Parse(ctx.Param("user_id")) if err != nil { oops.Handling(ctx, err) return @@ -123,9 +123,9 @@ func disable(ctx *gin.Context) { ctx.JSON(http.StatusCreated, utils.NoContent{}) } -// @Router /v1/auth/user/{user_uuid}/otp/configure [POST] +// @Router /v1/auth/user/{user_id}/otp/configure [POST] func configure(ctx *gin.Context) { - userID, err := uuid.Parse(ctx.Param("user_uuid")) + userID, err := uuid.Parse(ctx.Param("user_id")) if err != nil { oops.Handling(ctx, err) return @@ -139,9 +139,9 @@ func configure(ctx *gin.Context) { ctx.JSON(http.StatusCreated, utils.NoContent{}) } -// @Router /v1/auth/user/{user_uuid}/otp/unconfigure [PUT] +// @Router /v1/auth/user/{user_id}/otp/unconfigure [PUT] func unconfigure(ctx *gin.Context) { - userID, err := uuid.Parse(ctx.Param("user_uuid")) + userID, err := uuid.Parse(ctx.Param("user_id")) if err != nil { oops.Handling(ctx, err) return @@ -155,9 +155,9 @@ func unconfigure(ctx *gin.Context) { ctx.JSON(http.StatusCreated, utils.NoContent{}) } -// @Router /v1/auth/user/{user_uuid}/otp/qrcode [GET] +// @Router /v1/auth/user/{user_id}/otp/qrcode [GET] func qrcode(ctx *gin.Context) { - userID, err := uuid.Parse(ctx.Param("user_uuid")) + userID, err := uuid.Parse(ctx.Param("user_id")) if err != nil { oops.Handling(ctx, err) return diff --git a/delivery/http/auth/handler_test.go b/delivery/http/auth/handler_test.go index ead5e06..63d34fb 100644 --- a/delivery/http/auth/handler_test.go +++ b/delivery/http/auth/handler_test.go @@ -54,7 +54,7 @@ func (a *testSuite) SetupSuite() { a.router.Use(middleware.RequestIdentifier(), handleUserLog()) Router(a.router.Group("v1/auth")) RouterAuthorization(a.router.Group("v1/auth")) - RouterAuthorization(a.router.Group("v1/auth/user/:user_uuid/otp")) + RouterAuthorization(a.router.Group("v1/auth/user/:user_id/otp")) } func (a *testSuite) TestShouldCreateUser() { diff --git a/delivery/http/auth/router.go b/delivery/http/auth/router.go index 9cbcbc9..43b1bda 100644 --- a/delivery/http/auth/router.go +++ b/delivery/http/auth/router.go @@ -21,7 +21,7 @@ func Router(r *gin.RouterGroup) { func RouterAuthorization(r *gin.RouterGroup) { r.DELETE("logout", logout) - user := r.Group("user/:user_uuid") + user := r.Group("user/:user_id") user.PUT("disable", disable) otp := user.Group("otp") diff --git a/middleware/auth.go b/middleware/auth.go index abce57b..ed2ffb3 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -72,7 +72,7 @@ func OnlyAdmin() gin.HandlerFunc { func Yourself() gin.HandlerFunc { return func(ctx *gin.Context) { session := GetSession(ctx) - userIn := ctx.Param("user_uuid") + userIn := ctx.Param("user_id") if session.UserID != userIn { log.Printf("WARNING: user (%v - %v) tried to access information for user (%v)", session.UserID, session.FirstName, userIn)