Commit 097064f

Thomasrludomikula

Thomasr

authored and

committed

Fixed groupApiservice(hasReadPermission) and ResourcePermissionHandler(orgUserPermissionMono).

Add superAdmin to permission.

1 parent 5bef239 commit 097064fCopy full SHA for 097064f

File tree

-3

lines changed

server/api-service
- lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service
  - ResourcePermissionHandler.java
- lowcoder-server/src/main/java/org/lowcoder/api/usermanagement
  - GroupApiServiceImpl.java

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnApplicati`
`249`	`249`	`Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)`
`250`	`250`	`.flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))`
`251`	`251`	`.flatMap(orgMember -> {`
`252`		`- if (orgMember.isAdmin()) {`
	`252`	`+ if (orgMember.isAdmin() \|\| orgMember.isSuperAdmin()) {`
`253`	`253`	`return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));`
`254`	`254`	`}`
`255`	`255`	`return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)`
`@@ -308,7 +308,7 @@ public Mono<UserPermissionOnResourceStatus> checkUserPermissionStatusOnBundle(St`
`308`	`308`	`Mono<UserPermissionOnResourceStatus> orgUserPermissionMono = getOrgId(resourceId)`
`309`	`309`	`.flatMap(orgId -> orgMemberService.getOrgMember(orgId, userId))`
`310`	`310`	`.flatMap(orgMember -> {`
`311`		`- if (orgMember.isAdmin()) {`
	`311`	`+ if (orgMember.isAdmin() \|\| orgMember.isSuperAdmin()) {`
`312`	`312`	`return Mono.just(UserPermissionOnResourceStatus.success(buildAdminPermission(resourceType, resourceId, userId)));`
`313`	`313`	`}`
`314`	`314`	`return getAllMatchingPermissions0(userId, orgMember.getOrgId(), resourceType, Collections.singleton(resourceId), resourceAction)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public Mono<GroupMemberAggregateView> getGroupMembers(String groupId, int page,`
`118`	`118`	`private boolean hasReadPermission(Tuple2<GroupMember, OrgMember> tuple) {`
`119`	`119`	`GroupMember groupMember = tuple.getT1();`
`120`	`120`	`OrgMember orgMember = tuple.getT2();`
`121`		`- return groupMember.isValid() \|\| orgMember.isAdmin();`
	`121`	`+ return orgMember.isSuperAdmin() \|\| groupMember.isValid() \|\| orgMember.isAdmin();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private boolean hasManagePermission(Tuple2<GroupMember, OrgMember> tuple) {`

Comments

(0)