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

fix: getOrganization without pagination for global admin (#2028)

Browse Source 
* fix: getOrganization without pagination for global admin return only built-in org

* fix gofumpt
This commit is contained in:
Ilya Sulimanov
2023-06-29 13:56:19 +03:00
committed by GitHub
parent 55784c68a3
commit 49a73f8138
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/organization.go
View File

@ -38,8 +38,17 @@ func (c *ApiController) GetOrganizations() {
sortField := c.Input().Get("sortField") sortField := c.Input().Get("sortField")
sortOrder := c.Input().Get("sortOrder") sortOrder := c.Input().Get("sortOrder")
isGlobalAdmin := c.IsGlobalAdmin()
if limit == "" || page == "" { if limit == "" || page == "" {
maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) var maskedOrganizations []*object.Organization
var err error
if isGlobalAdmin {
maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner))
} else {
maskedOrganizations, err = object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner))
}
if err != nil { if err != nil {
c.ResponseError(err.Error()) c.ResponseError(err.Error())
return return
@ -48,7 +57,6 @@ func (c *ApiController) GetOrganizations() {
c.Data["json"] = maskedOrganizations c.Data["json"] = maskedOrganizations
c.ServeJSON() c.ServeJSON()
} else { } else {
isGlobalAdmin := c.IsGlobalAdmin()
if !isGlobalAdmin { if !isGlobalAdmin {
maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner))
if err != nil { if err != nil {