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

Remove GetOrganizationByName().

Browse Source
This commit is contained in:
Yang Luo
2021-05-16 22:58:30 +08:00
parent e6862713bb
commit 6508d96162
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/account.go
View File

@ -152,7 +152,7 @@ func (c *ApiController) GetAccount() {
username := c.GetSessionUser() username := c.GetSessionUser()
user := object.GetUser(username) user := object.GetUser(username)
organization := object.GetOrganization(util.GetId(user.Owner)) organization := object.GetOrganizationByUser(user)
resp = Response{Status: "ok", Msg: "", Data: user, Data2: organization} resp = Response{Status: "ok", Msg: "", Data: user, Data2: organization}
c.Data["json"] = resp c.Data["json"] = resp

4
controllers/verification.go
View File

@ -58,7 +58,7 @@ func (c *ApiController) SendVerificationCode() {
c.ResponseError("Invalid phone number") c.ResponseError("Invalid phone number")
return return
} }
org := object.GetOrganizationByName(user.Owner) org := object.GetOrganizationByUser(user)
phonePrefix := "86" phonePrefix := "86"
if org != nil && org.PhonePrefix != "" { if org != nil && org.PhonePrefix != "" {
phonePrefix = org.PhonePrefix phonePrefix = org.PhonePrefix
@ -98,7 +98,7 @@ func (c *ApiController) ResetEmailOrPhone() {
checkDest := dest checkDest := dest
if destType == "phone" { if destType == "phone" {
org := object.GetOrganizationByName(user.Owner) org := object.GetOrganizationByUser(user)
phonePrefix := "86" phonePrefix := "86"
if org != nil && org.PhonePrefix != "" { if org != nil && org.PhonePrefix != "" {
phonePrefix = org.PhonePrefix phonePrefix = org.PhonePrefix

2
object/check.go
View File

@ -58,7 +58,7 @@ func CheckUserSignup(organizationName string, username string, password string,
} }
func CheckPassword(user *User, password string) string { func CheckPassword(user *User, password string) string {
organization := getOrganizationByUser(user) organization := GetOrganizationByUser(user)
if organization.PasswordType == "plain" { if organization.PasswordType == "plain" {
if password == user.Password { if password == user.Password {

15
object/organization.go
View File

@ -93,19 +93,6 @@ func DeleteOrganization(organization *Organization) bool {
return affected != 0 return affected != 0
} }
func GetOrganizationByName(name string) *Organization { func GetOrganizationByUser(user *User) *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 {
return getOrganization("admin", user.Owner) return getOrganization("admin", user.Owner)
} }

6
object/user.go
View File

@ -116,7 +116,7 @@ func UpdateUserForOriginal(user *User) bool {
func AddUser(user *User) bool { func AddUser(user *User) bool {
user.Id = util.GenerateId() user.Id = util.GenerateId()
organization := getOrganizationByUser(user) organization := GetOrganizationByUser(user)
user.UpdateUserPassword(organization) user.UpdateUserPassword(organization)
user.UpdateUserHash() user.UpdateUserHash()
@ -135,7 +135,7 @@ func AddUsers(users []*User) bool {
return false return false
} }
organization := getOrganizationByUser(users[0]) organization := GetOrganizationByUser(users[0])
for _, user := range users { for _, user := range users {
user.UpdateUserPassword(organization) user.UpdateUserPassword(organization)
@ -227,7 +227,7 @@ func GetUserByFields(organization string, field string) *User {
func SetUserField(user *User, field string, value string) bool { func SetUserField(user *User, field string, value string) bool {
if field == "password" { if field == "password" {
organization := getOrganizationByUser(user) organization := GetOrganizationByUser(user)
user.UpdateUserPassword(organization) user.UpdateUserPassword(organization)
value = user.Password value = user.Password
} }