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

Move passwordType to org.

Browse Source
This commit is contained in:
Yang Luo
2021-05-05 23:32:21 +08:00
parent fffada894c
commit f442f11568
10 changed files with 42 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
object/check.go
View File

@ -56,20 +56,22 @@ func CheckUserSignup(organization string, username string, password string, disp
}
func checkPassword(user *User, password string) string {
if user.PasswordType == "plain" {
organization := getOrganization("admin", user.Owner)
if organization.PasswordType == "plain" {
if password == user.Password {
return ""
} else {
return "password incorrect"
}
} else if user.PasswordType == "salt" {
} else if organization.PasswordType == "salt" {
if getSaltedPassword(password) == user.Password {
return ""
} else {
return "password incorrect"
}
} else {
return fmt.Sprintf("unsupported password type: %s", user.PasswordType)
return fmt.Sprintf("unsupported password type: %s", organization.PasswordType)
}
}
@ -79,15 +81,15 @@ func CheckUserLogin(organization string, username string, password string) (*Use
return nil, "the user does not exist, please sign up first"
}
if user.IsForbidden {
return nil, "the user is forbidden to sign in, please contact the administrator"
}
msg := checkPassword(user, password)
if msg != "" {
return nil, msg
}
if user.IsForbidden {
return nil, "the user is forbidden to sign in, please contact the administrator"
}
return user, ""
}