account/account.go

@@ -202,10 +202,10 @@ func (s AccountServiceDefault) VerifyEmail(email string, token string) error {
 
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
-			return NewAccountError(ErrKeyUserNotFound, nil)
+			return NewAccountError(ErrKeyEmailVerificationFailed, nil)
 		}
 
-		return NewAccountError(ErrKeySecurityInvalidToken, nil)
+		return NewAccountError(ErrKeyDatabaseOperationFailed, result.Error)
 	}
 
 	if verification.ExpiresAt.Before(time.Now()) {

account/errors.go

@@ -25,8 +25,9 @@ const (
 	ErrKeyHashingFailed         = "ErrHashingFailed"
 
 	// Account update errors
-	ErrKeyAccountUpdateFailed    = "ErrAccountUpdateFailed"
+	ErrKeyAccountUpdateFailed     = "ErrAccountUpdateFailed"
-	ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified"
+	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.",
+	ErrKeyAccountUpdateFailed:     "Failed to update account information.",
-	ErrKeyAccountAlreadyVerified: "Account is already verified.",
+	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,
+		ErrKeyAccountUpdateFailed:     http.StatusInternalServerError,
-		ErrKeyAccountAlreadyVerified: http.StatusConflict,
+		ErrKeyAccountAlreadyVerified:  http.StatusConflict,
+		ErrKeyEmailVerificationFailed: http.StatusInternalServerError,
 
 		// JWT generation errors
 		ErrKeyJWTGenerationFailed: http.StatusInternalServerError,

api/account/account.go

@@ -172,7 +172,7 @@ func (a AccountAPI) verifyEmail(jc jape.Context) {
 
 	err := a.accounts.VerifyEmail(request.Email, request.Token)
 
-	if jc.Check("Failed to verify email", err) != nil {
+	if jc.Check("failed to verify email", err) != nil {
 		return
 	}
 }