Merge branch 'main' into v1_0_0

This commit is contained in:
Michael Quigley 2024-09-25 11:40:10 -04:00
commit f07d1817d7
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62

View File

@ -77,7 +77,7 @@ func (h *inviteHandler) Handle(params account.InviteParams) middleware.Responder
if oldAr, err := str.FindAccountRequestWithEmail(params.Body.Email, tx); err == nil { if oldAr, err := str.FindAccountRequestWithEmail(params.Body.Email, tx); err == nil {
logrus.Warnf("found previous account request for '%v', removing", params.Body.Email) logrus.Warnf("found previous account request for '%v', removing", params.Body.Email)
if err := str.DeleteAccountRequest(oldAr.Id, tx); err != nil { if err := str.DeleteAccountRequest(oldAr.Id, tx); err != nil {
logrus.Errorf("error deleteing previous account request for '%v': %v", params.Body.Email, err) logrus.Errorf("error deleting previous account request for '%v': %v", params.Body.Email, err)
return account.NewInviteInternalServerError() return account.NewInviteInternalServerError()
} }
} else { } else {