Use util.GetId()

This commit is contained in:
Yang Luo
2023-05-19 14:26:32 +08:00
parent de73ff0e60
commit 79bd58e0e6
8 changed files with 11 additions and 14 deletions

View File

@ -15,13 +15,13 @@
package authz
import (
"fmt"
"strings"
"github.com/casbin/casbin/v2"
"github.com/casbin/casbin/v2/model"
"github.com/casdoor/casdoor/conf"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
xormadapter "github.com/casdoor/xorm-adapter/v3"
stringadapter "github.com/qiangmzsx/string-adapter/v2"
)
@ -150,8 +150,7 @@ func IsAllowed(subOwner string, subName string, method string, urlPath string, o
}
}
userId := fmt.Sprintf("%s/%s", subOwner, subName)
user := object.GetUser(userId)
user := object.GetUser(util.GetId(subOwner, subName))
if user != nil && user.IsAdmin && (subOwner == objOwner || (objOwner == "admin")) {
return true
}