LumeWeb
/
portal
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: LumeWeb:ea5a97c6137da57ef34aa923fddc11fe2a4638d2
Branches Tags
LumeWeb:master
LumeWeb:develop
LumeWeb:v0.1.0-develop.3
LumeWeb:v0.1.0-develop.2
LumeWeb:v0.1.0-develop.1
LumeWeb:v0.0.1
..
compare: LumeWeb:12a9ad28fdbea9b55da3b9a7f047f6407c2b50e0
Branches Tags
LumeWeb:develop
LumeWeb:master
LumeWeb:v0.1.0-develop.3
LumeWeb:v0.1.0-develop.2
LumeWeb:v0.1.0-develop.1
LumeWeb:v0.0.1

No commits in common. "ea5a97c6137da57ef34aa923fddc11fe2a4638d2" and "12a9ad28fdbea9b55da3b9a7f047f6407c2b50e0" have entirely different histories.
ea5a97c613 ... 12a9ad28fd

2 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

6
account/account.go
View File

@ -134,10 +134,6 @@ func (s AccountServiceDefault) SendEmailVerification(userId uint) error {
return err return err
} }
if user.Verified {
return NewAccountError(ErrKeyAccountAlreadyVerified, nil)
}
token := GenerateSecurityToken() token := GenerateSecurityToken()
var verification models.EmailVerification var verification models.EmailVerification
@ -202,7 +198,7 @@ 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, result.Error) return NewAccountError(ErrKeyUserNotFound, result.Error)
} }
return NewAccountError(ErrKeyDatabaseOperationFailed, result.Error) return NewAccountError(ErrKeyDatabaseOperationFailed, result.Error)

12
account/errors.go
View File

@ -25,9 +25,7 @@ const (
ErrKeyHashingFailed = "ErrHashingFailed" ErrKeyHashingFailed = "ErrHashingFailed"
// Account update errors // Account update errors
ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed" ErrKeyAccountUpdateFailed = "ErrAccountUpdateFailed"
ErrKeyAccountAlreadyVerified = "ErrAccountAlreadyVerified"
ErrKeyEmailVerificationFailed = "ErrEmailVerificationFailed"
// JWT generation errors // JWT generation errors
ErrKeyJWTGenerationFailed = "ErrJWTGenerationFailed" ErrKeyJWTGenerationFailed = "ErrJWTGenerationFailed"
@ -74,9 +72,7 @@ var defaultErrorMessages = map[string]string{
ErrKeyLoginFailed: "Login failed due to an internal error.", ErrKeyLoginFailed: "Login failed due to an internal error.",
// Account update errors // Account update errors
ErrKeyAccountUpdateFailed: "Failed to update account information.", ErrKeyAccountUpdateFailed: "Failed to update account information.",
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.",
@ -122,9 +118,7 @@ var (
ErrKeyLoginFailed: http.StatusInternalServerError, ErrKeyLoginFailed: http.StatusInternalServerError,
// Account update errors // Account update errors
ErrKeyAccountUpdateFailed: http.StatusInternalServerError, ErrKeyAccountUpdateFailed: http.StatusInternalServerError,
ErrKeyAccountAlreadyVerified: http.StatusConflict,
ErrKeyEmailVerificationFailed: http.StatusInternalServerError,
// JWT generation errors // JWT generation errors
ErrKeyJWTGenerationFailed: http.StatusInternalServerError, ErrKeyJWTGenerationFailed: http.StatusInternalServerError,