llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 20:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix CheckUpdateUser() logic to fix add-user error

Browse Source
This commit is contained in:
Yang Luo
2024-11-06 08:34:13 +08:00
parent 0818de85d1
commit ba2e997d54
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
object/check.go
View File

@ -537,14 +537,19 @@ func CheckUsernameWithEmail(username string, lang string) string {
func CheckUpdateUser(oldUser, user *User, lang string) string { func CheckUpdateUser(oldUser, user *User, lang string) string {
if oldUser.Name != user.Name { if oldUser.Name != user.Name {
// Check if the organization uses email as the username organizationName := oldUser.Owner
organization, err := GetOrganizationByUser(oldUser) if organizationName == "" {
organizationName = user.Owner
}
organization, err := getOrganization("admin", organizationName)
if err != nil { if err != nil {
return err.Error() return err.Error()
} }
if organization == nil { if organization == nil {
return fmt.Sprintf(i18n.Translate(lang, "The organization: %s does not exist"), oldUser.Owner) return fmt.Sprintf(i18n.Translate(lang, "auth:The organization: %s does not exist"), organizationName)
} }
if organization.UseEmailAsUsername { if organization.UseEmailAsUsername {
if msg := CheckUsernameWithEmail(user.Name, lang); msg != "" { if msg := CheckUsernameWithEmail(user.Name, lang); msg != "" {
return msg return msg