Compare commits
3 Commits
5a9f4a5940
...
4ca78df050
Author | SHA1 | Date |
---|---|---|
Derrick Hammer | 4ca78df050 | |
Derrick Hammer | adc5bc213e | |
Derrick Hammer | 501de26793 |
|
@ -202,10 +202,10 @@ func (s AccountServiceDefault) VerifyEmail(email string, token string) error {
|
||||||
|
|
||||||
if result.Error != nil {
|
if result.Error != nil {
|
||||||
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
|
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
|
||||||
return NewAccountError(ErrKeyEmailVerificationFailed, nil)
|
return NewAccountError(ErrKeyUserNotFound, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
return NewAccountError(ErrKeyDatabaseOperationFailed, result.Error)
|
return NewAccountError(ErrKeySecurityInvalidToken, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
if verification.ExpiresAt.Before(time.Now()) {
|
if verification.ExpiresAt.Before(time.Now()) {
|
||||||
|
|
|
@ -27,7 +27,6 @@ const (
|
||||||
// Account update errors
|
// Account update errors
|
||||||
ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed"
|
ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed"
|
||||||
ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified"
|
ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified"
|
||||||
ErrKeyEmailVerificationFailed = "ErrEmailVerificationFailed"
|
|
||||||
|
|
||||||
// JWT generation errors
|
// JWT generation errors
|
||||||
ErrKeyJWTGenerationFailed = "ErrJWTGenerationFailed"
|
ErrKeyJWTGenerationFailed = "ErrJWTGenerationFailed"
|
||||||
|
@ -76,7 +75,6 @@ var defaultErrorMessages = map[string]string{
|
||||||
// Account update errors
|
// 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
|
// JWT generation errors
|
||||||
ErrKeyJWTGenerationFailed: "Failed to generate a new JWT token.",
|
ErrKeyJWTGenerationFailed: "Failed to generate a new JWT token.",
|
||||||
|
@ -124,7 +122,6 @@ var (
|
||||||
// Account update errors
|
// Account update errors
|
||||||
ErrKeyAccountUpdateFailed: http.StatusInternalServerError,
|
ErrKeyAccountUpdateFailed: http.StatusInternalServerError,
|
||||||
ErrKeyAccountAlreadyVerified: http.StatusConflict,
|
ErrKeyAccountAlreadyVerified: http.StatusConflict,
|
||||||
ErrKeyEmailVerificationFailed: http.StatusInternalServerError,
|
|
||||||
|
|
||||||
// JWT generation errors
|
// JWT generation errors
|
||||||
ErrKeyJWTGenerationFailed: http.StatusInternalServerError,
|
ErrKeyJWTGenerationFailed: http.StatusInternalServerError,
|
||||||
|
|
|
@ -172,7 +172,7 @@ func (a AccountAPI) verifyEmail(jc jape.Context) {
|
||||||
|
|
||||||
err := a.accounts.VerifyEmail(request.Email, request.Token)
|
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
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue