opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop re-wrapping password reset email error in another error (#9382)

Browse Source
This commit is contained in:
Harrison Healey
2018-09-10 07:42:59 -04:00
committed by Martin Kraft
parent 504591e7d6
commit 435ce3df4b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/user.go
+1 -5
View File
@@ -1176,11 +1176,7 @@ func (a *App) SendPasswordReset(email string, siteURL string) (bool, *model.AppE
return false, err
}
if _, err := a.SendPasswordResetEmail(user.Email, token, user.Locale, siteURL); err != nil {
return false, model.NewAppError("SendPasswordReset", "api.user.send_password_reset.send.app_error", nil, "err="+err.Message, http.StatusInternalServerError)
}
return true, nil
return a.SendPasswordResetEmail(user.Email, token, user.Locale, siteURL)
}
func (a *App) CreatePasswordRecoveryToken(userId string) (*model.Token, *model.AppError) {