From a79a2e7e550cba63305bf03b46e4f860e1442deb Mon Sep 17 00:00:00 2001 From: hsluoyz Date: Sat, 1 Mar 2025 12:57:11 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20don't=20send=20verification?= =?UTF-8?q?=20code=20if=20failed=20signin=20limit=20is=20reached=20?= =?UTF-8?q?=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f2e3037bc5c1aa7e7394b2bd734c45ef06516ec4. --- controllers/verification.go | 4 ++-- object/verification.go | 15 +++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/controllers/verification.go b/controllers/verification.go index 8a3f775a..1fb1f62f 100644 --- a/controllers/verification.go +++ b/controllers/verification.go @@ -258,7 +258,7 @@ func (c *ApiController) SendVerificationCode() { return } - sendResp = object.SendVerificationCodeToEmail(organization, user, provider, clientIp, vform.Dest, c.GetAcceptLanguage()) + sendResp = object.SendVerificationCodeToEmail(organization, user, provider, clientIp, vform.Dest) case object.VerifyTypePhone: if vform.Method == LoginVerification || vform.Method == ForgetVerification { if user != nil && util.GetMaskedPhone(user.Phone) == vform.Dest { @@ -304,7 +304,7 @@ func (c *ApiController) SendVerificationCode() { c.ResponseError(fmt.Sprintf(c.T("verification:Phone number is invalid in your region %s"), vform.CountryCode)) return } else { - sendResp = object.SendVerificationCodeToPhone(organization, user, provider, clientIp, phone, c.GetAcceptLanguage()) + sendResp = object.SendVerificationCodeToPhone(organization, user, provider, clientIp, phone) } } diff --git a/object/verification.go b/object/verification.go index 6bfc1c4e..62c67eac 100644 --- a/object/verification.go +++ b/object/verification.go @@ -60,7 +60,7 @@ type VerificationRecord struct { IsUsed bool `xorm:"notnull" json:"isUsed"` } -func IsAllowSend(user *User, remoteAddr, recordType, lang string) error { +func IsAllowSend(user *User, remoteAddr, recordType string) error { var record VerificationRecord record.RemoteAddr = remoteAddr record.Type = recordType @@ -78,15 +78,10 @@ func IsAllowSend(user *User, remoteAddr, recordType, lang string) error { return errors.New("you can only send one code in 60s") } - err = checkSigninErrorTimes(user, lang) - if err != nil { - return err - } - return nil } -func SendVerificationCodeToEmail(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string, lang string) error { +func SendVerificationCodeToEmail(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) error { sender := organization.DisplayName title := provider.Title @@ -104,7 +99,7 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide } content = strings.Replace(content, "%{user.friendlyName}", userString, 1) - err := IsAllowSend(user, remoteAddr, provider.Category, lang) + err := IsAllowSend(user, remoteAddr, provider.Category) if err != nil { return err } @@ -122,8 +117,8 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide return nil } -func SendVerificationCodeToPhone(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string, lang string) error { - err := IsAllowSend(user, remoteAddr, provider.Category, lang) +func SendVerificationCodeToPhone(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) error { + err := IsAllowSend(user, remoteAddr, provider.Category) if err != nil { return err }