mirror of
https://github.com/casdoor/casdoor.git
synced 2025-07-03 12:30:19 +08:00
Remove GetOrganizationByName().
This commit is contained in:
@ -58,7 +58,7 @@ func CheckUserSignup(organizationName string, username string, password string,
|
||||
}
|
||||
|
||||
func CheckPassword(user *User, password string) string {
|
||||
organization := getOrganizationByUser(user)
|
||||
organization := GetOrganizationByUser(user)
|
||||
|
||||
if organization.PasswordType == "plain" {
|
||||
if password == user.Password {
|
||||
|
@ -93,19 +93,6 @@ func DeleteOrganization(organization *Organization) bool {
|
||||
return affected != 0
|
||||
}
|
||||
|
||||
func GetOrganizationByName(name string) *Organization {
|
||||
var ret Organization
|
||||
ret.Name = name
|
||||
has, err := adapter.Engine.Get(&ret)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
if !has {
|
||||
return nil
|
||||
}
|
||||
return &ret
|
||||
}
|
||||
|
||||
func getOrganizationByUser(user *User) *Organization {
|
||||
func GetOrganizationByUser(user *User) *Organization {
|
||||
return getOrganization("admin", user.Owner)
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ func UpdateUserForOriginal(user *User) bool {
|
||||
func AddUser(user *User) bool {
|
||||
user.Id = util.GenerateId()
|
||||
|
||||
organization := getOrganizationByUser(user)
|
||||
organization := GetOrganizationByUser(user)
|
||||
user.UpdateUserPassword(organization)
|
||||
|
||||
user.UpdateUserHash()
|
||||
@ -135,7 +135,7 @@ func AddUsers(users []*User) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
organization := getOrganizationByUser(users[0])
|
||||
organization := GetOrganizationByUser(users[0])
|
||||
for _, user := range users {
|
||||
user.UpdateUserPassword(organization)
|
||||
|
||||
@ -227,7 +227,7 @@ func GetUserByFields(organization string, field string) *User {
|
||||
|
||||
func SetUserField(user *User, field string, value string) bool {
|
||||
if field == "password" {
|
||||
organization := getOrganizationByUser(user)
|
||||
organization := GetOrganizationByUser(user)
|
||||
user.UpdateUserPassword(organization)
|
||||
value = user.Password
|
||||
}
|
||||
|
Reference in New Issue
Block a user