diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-28 12:07:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 12:07:52 -0400 |
| commit | 7bde11d21b8d7f0bdd35a179223d0024484f83e7 (patch) | |
| tree | bf5ad9ddb8d7ce3d9683e17046a57db8b240ac7d | |
| parent | 28e0b8dc27e71c4b383f49db3be2a31088924bf1 (diff) | |
| download | chat-7bde11d21b8d7f0bdd35a179223d0024484f83e7.tar.gz chat-7bde11d21b8d7f0bdd35a179223d0024484f83e7.tar.bz2 chat-7bde11d21b8d7f0bdd35a179223d0024484f83e7.zip | |
Make sure to log errors when failing to send emails (#6754)
| -rw-r--r-- | api4/user.go | 4 | ||||
| -rw-r--r-- | app/user.go | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/api4/user.go b/api4/user.go index 69bea945a..24c1c917b 100644 --- a/api4/user.go +++ b/api4/user.go @@ -1016,10 +1016,10 @@ func sendVerificationEmail(c *Context, w http.ResponseWriter, r *http.Request) { return } - app.SendEmailVerification(user) + err = app.SendEmailVerification(user) if err != nil { // Don't want to leak whether the email is valid or not - l4g.Error("Unable to create email verification token: " + err.Error()) + l4g.Error(err.Error()) ReturnStatusOK(w) return } diff --git a/app/user.go b/app/user.go index 07e38cc9b..de5881d00 100644 --- a/app/user.go +++ b/app/user.go @@ -1287,12 +1287,10 @@ func SendEmailVerification(user *model.User) *model.AppError { } if _, err := GetStatus(user.Id); err != nil { - go SendVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) + return SendVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) } else { - go SendEmailChangeVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) + return SendEmailChangeVerifyEmail(user.Email, user.Locale, utils.GetSiteURL(), token.Token) } - - return nil } func VerifyEmailFromToken(userSuppliedTokenString string) *model.AppError { |