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

Refactor getPermissionsAndRolesByUser() related code

Browse Source
This commit is contained in:
Yang Luo
2023-09-24 08:01:18 +08:00
parent 111d1a5786
commit 687830697e
5 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
object/permission.go
View File

@ -258,9 +258,18 @@ func DeletePermission(permission *Permission) (bool, error) {
return affected != 0, nil
}
func GetPermissionsAndRolesByUser(userId string) ([]*Permission, []*Role, error) {
func getPermissionsByUser(userId string) ([]*Permission, error) {
permissions := []*Permission{}
err := ormer.Engine.Where("users like ?", "%"+userId+"\"%").Find(&permissions)
if err != nil {
return permissions, err
}
return permissions, nil
}
func getPermissionsAndRolesByUser(userId string) ([]*Permission, []*Role, error) {
permissions, err := getPermissionsByUser(userId)
if err != nil {
return nil, nil, err
}
@ -277,14 +286,13 @@ func GetPermissionsAndRolesByUser(userId string) ([]*Permission, []*Role, error)
permFromRoles := []*Permission{}
roles, err := GetRolesByUser(userId)
roles, err := getRolesByUser(userId)
if err != nil {
return nil, nil, err
}
for _, role := range roles {
perms := []*Permission{}
err := ormer.Engine.Where("roles like ?", "%"+role.GetId()+"\"%").Find(&perms)
perms, err := GetPermissionsByRole(role.GetId())
if err != nil {
return nil, nil, err
}