feat: don't use organization.MasterVerificationCode when sending

This commit is contained in:
Yang Luo 2025-02-14 16:24:38 +08:00
parent 63b8e857bc
commit 26eea501be
2 changed files with 7 additions and 7 deletions

View File

@ -252,7 +252,7 @@ func CheckPassword(user *User, password string, lang string, options ...bool) er
credManager := cred.GetCredManager(passwordType)
if credManager != nil {
if organization.MasterPassword != "" {
if credManager.IsPasswordCorrect(password, organization.MasterPassword, "", organization.PasswordSalt) {
if password == organization.MasterPassword || credManager.IsPasswordCorrect(password, organization.MasterPassword, "", organization.PasswordSalt) {
return resetUserSigninErrorTimes(user)
}
}

View File

@ -86,9 +86,9 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide
title := provider.Title
code := getRandomCode(6)
if organization.MasterVerificationCode != "" {
code = organization.MasterVerificationCode
}
// if organization.MasterVerificationCode != "" {
// code = organization.MasterVerificationCode
// }
// "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes."
content := strings.Replace(provider.Content, "%s", code, 1)
@ -124,9 +124,9 @@ func SendVerificationCodeToPhone(organization *Organization, user *User, provide
}
code := getRandomCode(6)
if organization.MasterVerificationCode != "" {
code = organization.MasterVerificationCode
}
// if organization.MasterVerificationCode != "" {
// code = organization.MasterVerificationCode
// }
err = SendSms(provider, code, dest)
if err != nil {