From 5bcfd95cb3d0b6a6878312021ff0c56cad4e6164 Mon Sep 17 00:00:00 2001 From: Sergey Chubaryan Date: Thu, 20 Feb 2025 06:28:13 +0300 Subject: [PATCH] fix validation in request handlers --- cmd/backend/server/handlers/dummy.go | 2 +- cmd/backend/server/handlers/user_change_password.go | 4 ++-- cmd/backend/server/handlers/user_create.go | 8 ++++---- cmd/backend/server/handlers/user_login.go | 4 ++-- cmd/backend/server/handlers/user_restore_password.go | 4 ++-- cmd/backend/server/handlers/user_send_restore_password.go | 2 +- cmd/backend/server/handlers/user_send_verify.go | 2 +- cmd/backend/server/server.go | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/backend/server/handlers/dummy.go b/cmd/backend/server/handlers/dummy.go index 7dc5af3..35ea147 100644 --- a/cmd/backend/server/handlers/dummy.go +++ b/cmd/backend/server/handlers/dummy.go @@ -2,7 +2,7 @@ package handlers import "github.com/gin-gonic/gin" -func NewDummyHandler() gin.HandlerFunc { +func New200OkHandler() gin.HandlerFunc { return func(ctx *gin.Context) { ctx.Status(200) } diff --git a/cmd/backend/server/handlers/user_change_password.go b/cmd/backend/server/handlers/user_change_password.go index 87179a9..80d183d 100644 --- a/cmd/backend/server/handlers/user_change_password.go +++ b/cmd/backend/server/handlers/user_change_password.go @@ -12,8 +12,8 @@ import ( ) type inputChangePassword struct { - OldPassword string `json:"oldPassword"` - NewPassword string `json:"newPassword"` + OldPassword string `json:"oldPassword" binding:"required"` + NewPassword string `json:"newPassword" binding:"required"` } func NewUserChangePasswordHandler(log logger.Logger, userService services.UserService) gin.HandlerFunc { diff --git a/cmd/backend/server/handlers/user_create.go b/cmd/backend/server/handlers/user_create.go index 35eece3..a65b78f 100644 --- a/cmd/backend/server/handlers/user_create.go +++ b/cmd/backend/server/handlers/user_create.go @@ -10,9 +10,9 @@ import ( ) type createUserInput struct { - Email string `json:"email" validate:"required,email"` - Password string `json:"password" validate:"required"` - Name string `json:"name" validate:"required"` + Email string `json:"email" binding:"required,email"` + Password string `json:"password" binding:"required"` + Name string `json:"name" binding:"required"` } type createUserOutput struct { @@ -31,7 +31,7 @@ func NewUserCreateHandler(log logger.Logger, userService services.UserService) g Name: input.Name, }, ) - + if err != nil { return createUserOutput{}, err } diff --git a/cmd/backend/server/handlers/user_login.go b/cmd/backend/server/handlers/user_login.go index 90193dd..106a1ee 100644 --- a/cmd/backend/server/handlers/user_login.go +++ b/cmd/backend/server/handlers/user_login.go @@ -10,8 +10,8 @@ import ( ) type loginUserInput struct { - Login string `json:"email" validate:"required,email"` - Password string `json:"password"` + Login string `json:"email" binding:"required,email"` + Password string `json:"password" binding:"required"` } type loginUserOutput struct { diff --git a/cmd/backend/server/handlers/user_restore_password.go b/cmd/backend/server/handlers/user_restore_password.go index 076ef19..9d1abb8 100644 --- a/cmd/backend/server/handlers/user_restore_password.go +++ b/cmd/backend/server/handlers/user_restore_password.go @@ -10,8 +10,8 @@ import ( ) type inputRestorePassword struct { - Token string `json:"token"` - NewPassword string `json:"password"` + Token string `json:"token" binding:"required"` + NewPassword string `json:"password" binding:"required"` } func NewUserRestorePasswordHandler(log logger.Logger, userService services.UserService) gin.HandlerFunc { diff --git a/cmd/backend/server/handlers/user_send_restore_password.go b/cmd/backend/server/handlers/user_send_restore_password.go index 00725f8..a73f849 100644 --- a/cmd/backend/server/handlers/user_send_restore_password.go +++ b/cmd/backend/server/handlers/user_send_restore_password.go @@ -10,7 +10,7 @@ import ( ) type inputSendRestorePassword struct { - Email string `json:"email" validate:"required,email"` + Email string `json:"email" binding:"required,email"` } func NewUserSendRestorePasswordHandler(log logger.Logger, userService services.UserService) gin.HandlerFunc { diff --git a/cmd/backend/server/handlers/user_send_verify.go b/cmd/backend/server/handlers/user_send_verify.go index 7938d4c..6648b97 100644 --- a/cmd/backend/server/handlers/user_send_verify.go +++ b/cmd/backend/server/handlers/user_send_verify.go @@ -10,7 +10,7 @@ import ( ) type inputSendVerify struct { - Email string `json:"email" validate:"required,email"` + Email string `json:"email" binding:"required,email"` } func NewUserSendVerifyEmailHandler(log logger.Logger, userService services.UserService) gin.HandlerFunc { diff --git a/cmd/backend/server/server.go b/cmd/backend/server/server.go index d5071a9..e76b7d4 100644 --- a/cmd/backend/server/server.go +++ b/cmd/backend/server/server.go @@ -29,7 +29,7 @@ func NewServer(opts NewServerOpts) *httpserver.Server { r.ContextWithFallback = true // Use it to allow getting values from c.Request.Context() // r.Static("/webapp", "./webapp") - r.GET("/health", handlers.NewDummyHandler()) + r.GET("/health", handlers.New200OkHandler()) prometheus := integrations.NewPrometheus() r.Any("/metrics", gin.WrapH(prometheus.GetRequestHandler()))