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

Add userId param to GetAllObjects() API

Browse Source
This commit is contained in:
Yang Luo
2024-01-13 18:03:40 +08:00
parent 79b393afee
commit 177f2f2f11
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/auth.go
View File

@ -973,7 +973,7 @@ func (c *ApiController) GetWebhookEventType() {
// @router /api/get-captcha-status [get] // @router /api/get-captcha-status [get]
func (c *ApiController) GetCaptchaStatus() { func (c *ApiController) GetCaptchaStatus() {
organization := c.Input().Get("organization") organization := c.Input().Get("organization")
userId := c.Input().Get("user_id") userId := c.Input().Get("userId")
user, err := object.GetUserByFields(organization, userId) user, err := object.GetUserByFields(organization, userId)
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())

27
controllers/casbin_api.go
View File

@ -264,10 +264,13 @@ func (c *ApiController) BatchEnforce() {
} }
func (c *ApiController) GetAllObjects() { func (c *ApiController) GetAllObjects() {
userId := c.GetSessionUsername() userId := c.Input().Get("userId")
if userId == "" { if userId == "" {
c.ResponseError(c.T("general:Please login first")) userId = c.GetSessionUsername()
return if userId == "" {
c.ResponseError(c.T("general:Please login first"))
return
}
} }
objects, err := object.GetAllObjects(userId) objects, err := object.GetAllObjects(userId)
@ -280,10 +283,13 @@ func (c *ApiController) GetAllObjects() {
} }
func (c *ApiController) GetAllActions() { func (c *ApiController) GetAllActions() {
userId := c.GetSessionUsername() userId := c.Input().Get("userId")
if userId == "" { if userId == "" {
c.ResponseError(c.T("general:Please login first")) userId = c.GetSessionUsername()
return if userId == "" {
c.ResponseError(c.T("general:Please login first"))
return
}
} }
actions, err := object.GetAllActions(userId) actions, err := object.GetAllActions(userId)
@ -296,10 +302,13 @@ func (c *ApiController) GetAllActions() {
} }
func (c *ApiController) GetAllRoles() { func (c *ApiController) GetAllRoles() {
userId := c.GetSessionUsername() userId := c.Input().Get("userId")
if userId == "" { if userId == "" {
c.ResponseError(c.T("general:Please login first")) userId = c.GetSessionUsername()
return if userId == "" {
c.ResponseError(c.T("general:Please login first"))
return
}
} }
roles, err := object.GetAllRoles(userId) roles, err := object.GetAllRoles(userId)

2
web/src/auth/AuthBackend.js
View File

@ -146,7 +146,7 @@ export function getWechatMessageEvent() {
} }
export function getCaptchaStatus(values) { export function getCaptchaStatus(values) {
return fetch(`${Setting.ServerUrl}/api/get-captcha-status?organization=${values["organization"]}&user_id=${values["username"]}`, { return fetch(`${Setting.ServerUrl}/api/get-captcha-status?organization=${values["organization"]}&userId=${values["username"]}`, {
method: "GET", method: "GET",
credentials: "include", credentials: "include",
headers: { headers: {