mirror of
https://github.com/openziti/zrok.git
synced 2025-06-30 14:30:30 +02:00
operational improvements in log messages (#186)
This commit is contained in:
@ -21,42 +21,42 @@ func (handler *resetPasswordHandler) Handle(params account.ResetPasswordParams)
|
||||
|
||||
tx, err := str.Begin()
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error starting transaction for '%v': %v", params.Body.Token, err)
|
||||
return account.NewResetPasswordInternalServerError()
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
|
||||
prr, err := str.FindPasswordResetRequestWithToken(params.Body.Token, tx)
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error finding reset request for '%v': %v", params.Body.Token, err)
|
||||
return account.NewResetPasswordNotFound()
|
||||
}
|
||||
|
||||
a, err := str.GetAccount(prr.AccountId, tx)
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error finding account for '%v': %v", params.Body.Token, err)
|
||||
return account.NewResetPasswordNotFound()
|
||||
}
|
||||
hpwd, err := hashPassword(params.Body.Password)
|
||||
if err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error hashing password for '%v' (%v): %v", params.Body.Token, a.Email, err)
|
||||
return account.NewResetPasswordRequestInternalServerError()
|
||||
}
|
||||
a.Salt = hpwd.Salt
|
||||
a.Password = hpwd.Password
|
||||
|
||||
if _, err := str.UpdateAccount(a, tx); err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error updating for '%v' (%v): %v", params.Body.Token, a.Email, err)
|
||||
return account.NewResetPasswordInternalServerError()
|
||||
}
|
||||
|
||||
if err := str.DeletePasswordResetRequest(prr.Id, tx); err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error deleting reset request '%v' (%v): %v", params.Body.Token, a.Email, err)
|
||||
return account.NewResetPasswordInternalServerError()
|
||||
}
|
||||
|
||||
if err := tx.Commit(); err != nil {
|
||||
logrus.Error(err)
|
||||
logrus.Errorf("error committing '%v' (%v): %v", params.Body.Token, a.Email, err)
|
||||
return account.NewResetPasswordInternalServerError()
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user