update otp

Author: miladrahimi

internal/http/server/handlers/v1/auth.go

@@ -31,11 +31,11 @@ type signInGoogleRequest struct {
 	Token string `json:"google_token" validate:"required"`
 }
 
-type otpEmailGetRequest struct {
+type otpEmailSendRequest struct {
 	Email string `json:"email" validate:"required,email,max=191"`
 }
 
-type otpEmailValidateRequest struct {
+type otpEmailVerifyRequest struct {
 	Email string `json:"email" validate:"required,email,max=191"`
 	Otp   string `json:"otp" validate:"required"`
 }
@@ -112,9 +112,9 @@ func AuthSignUp(ctr *container.Container) echo.HandlerFunc {
 	}
 }
 
-func AuthOtpEmailGenerate(ctr *container.Container) echo.HandlerFunc {
+func AuthOtpEmailSend(ctr *container.Container) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		var r otpEmailGetRequest
+		var r otpEmailSendRequest
 		if err := ctx.Bind(&r); err != nil {
 			return ctx.JSON(http.StatusBadRequest, map[string]string{
 				"message": "Cannot parse the request body.",
@@ -134,9 +134,9 @@ func AuthOtpEmailGenerate(ctr *container.Container) echo.HandlerFunc {
 	}
 }
 
-func AuthOtpEmailSubmit(ctr *container.Container) echo.HandlerFunc {
+func AuthOtpEmailVerify(ctr *container.Container) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		var r otpEmailValidateRequest
+		var r otpEmailVerifyRequest
 		if err := ctx.Bind(&r); err != nil {
 			return ctx.JSON(http.StatusBadRequest, map[string]string{
 				"message": "Cannot parse the request body.",

internal/http/server/routes.go

@@ -23,8 +23,8 @@ func (s *Server) registerRoutes() {
 			public.POST("auth/sign-in/email", v1.AuthSignInEmail(s.container))
 			public.POST("auth/sign-in/username", v1.AuthSignInUsername(s.container))
 			public.POST("auth/sign-in/google", v1.AuthSignInGoogle(s.container))
-			public.POST("auth/otp/email/generate", v1.AuthOtpEmailGenerate(s.container))
-			public.POST("auth/otp/email/submit", v1.AuthOtpEmailSubmit(s.container))
+			public.POST("auth/otp/email/send", v1.AuthOtpEmailSend(s.container))
+			public.POST("auth/otp/email/verify", v1.AuthOtpEmailVerify(s.container))
 		}
 
 		private := v1Api.Group("/", mw.Authorize(s.container))

internal/mailer/mailer.go

@@ -48,7 +48,9 @@ func (m *Mailer) SendOtp(to, otp string) {
 	message := strings.Join([]string{
 		"Dear user,",
 		"Your One-Time Password (OTP) for accessing your account is:",
+		"",
 		otp,
+		"",
 		"Please enter this code within the next 3 minutes to complete your verification process.",
 		"For your security, do not share this code with anyone.",
 		"If you did not request this code, please ignore this email.",