From ea5a97c6137da57ef34aa923fddc11fe2a4638d2 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Tue, 26 Mar 2024 20:19:38 -0400 Subject: [PATCH] fix: add error for email verification --- account/account.go | 2 +- account/errors.go | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/account/account.go b/account/account.go index 132421b..3a4228b 100644 --- a/account/account.go +++ b/account/account.go @@ -202,7 +202,7 @@ func (s AccountServiceDefault) VerifyEmail(email string, token string) error { if result.Error != nil { if errors.Is(result.Error, gorm.ErrRecordNotFound) { - return NewAccountError(ErrKeyUserNotFound, result.Error) + return NewAccountError(ErrKeyEmailVerificationFailed, result.Error) } return NewAccountError(ErrKeyDatabaseOperationFailed, result.Error) diff --git a/account/errors.go b/account/errors.go index 3076715..406eeb7 100644 --- a/account/errors.go +++ b/account/errors.go @@ -25,8 +25,9 @@ const ( ErrKeyHashingFailed = "ErrHashingFailed" // Account update errors - ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed" - ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified" + ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed" + ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified" + ErrKeyEmailVerificationFailed = "ErrEmailVerificationFailed" // JWT generation errors ErrKeyJWTGenerationFailed = "ErrJWTGenerationFailed" @@ -73,8 +74,9 @@ var defaultErrorMessages = map[string]string{ ErrKeyLoginFailed: "Login failed due to an internal error.", // Account update errors - ErrKeyAccountUpdateFailed: "Failed to update account information.", - ErrKeyAccountAlreadyVerified: "Account is already verified.", + ErrKeyAccountUpdateFailed: "Failed to update account information.", + ErrKeyAccountAlreadyVerified: "Account is already verified.", + ErrKeyEmailVerificationFailed: "Failed to verify email address.", // JWT generation errors ErrKeyJWTGenerationFailed: "Failed to generate a new JWT token.", @@ -120,8 +122,9 @@ var ( ErrKeyLoginFailed: http.StatusInternalServerError, // Account update errors - ErrKeyAccountUpdateFailed: http.StatusInternalServerError, - ErrKeyAccountAlreadyVerified: http.StatusConflict, + ErrKeyAccountUpdateFailed: http.StatusInternalServerError, + ErrKeyAccountAlreadyVerified: http.StatusConflict, + ErrKeyEmailVerificationFailed: http.StatusInternalServerError, // JWT generation errors ErrKeyJWTGenerationFailed: http.StatusInternalServerError,