Skip to content

Commit 321e816

Browse files
committed
fix: enhance resource authorization by updating permission checks to include WORKSPACE_MANAGE role
1 parent 3ed8dcd commit 321e816

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/** 系统「资源授权」按钮权限(按资源类型分组)。$perm.authorization.application.read() ... */
22

3-
import { canSys } from '../../policy'
4-
import { PermissionConstants as P } from '../../core'
3+
import { PermissionConstants as P, hasPermission, RoleConstants, Compare } from '../../core'
54

65
export default {
76
/**
@@ -11,29 +10,37 @@ export default {
1110
/**
1211
* 系统「资源授权」智能体只读权限
1312
* */
14-
read: () => canSys(P.APPLICATION_RESOURCE_PERMISSION_READ), edit: () => canSys(P.APPLICATION_RESOURCE_PERMISSION_EDIT) },
13+
read: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.APPLICATION_RESOURCE_PERMISSION_READ], Compare.OR),
14+
edit: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.APPLICATION_RESOURCE_PERMISSION_EDIT], Compare.OR),
15+
},
1516
/**
1617
* 系统「资源授权」知识库权限
1718
* */
1819
knowledge: {
1920
/**
2021
* 系统「资源授权」知识库只读权限
2122
* */
22-
read: () => canSys(P.KNOWLEDGE_RESOURCE_PERMISSION_READ), edit: () => canSys(P.KNOWLEDGE_RESOURCE_PERMISSION_EDIT) },
23+
read: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.KNOWLEDGE_RESOURCE_PERMISSION_READ], Compare.OR),
24+
edit: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.KNOWLEDGE_RESOURCE_PERMISSION_EDIT], Compare.OR),
25+
},
2326
/**
2427
* 系统「资源授权」工具权限
2528
* */
2629
tool: {
2730
/**
2831
* 系统「资源授权」工具只读权限
2932
* */
30-
read: () => canSys(P.TOOL_RESOURCE_PERMISSION_READ), edit: () => canSys(P.TOOL_RESOURCE_PERMISSION_EDIT) },
33+
read: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.TOOL_RESOURCE_PERMISSION_READ], Compare.OR),
34+
edit: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.TOOL_RESOURCE_PERMISSION_EDIT], Compare.OR),
35+
},
3136
/**
3237
* 系统「资源授权」模型权限
3338
* */
3439
model: {
3540
/**
3641
* 系统「资源授权」模型只读权限
3742
* */
38-
read: () => canSys(P.MODEL_RESOURCE_PERMISSION_READ), edit: () => canSys(P.MODEL_RESOURCE_PERMISSION_EDIT) },
43+
read: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.MODEL_RESOURCE_PERMISSION_READ], Compare.OR),
44+
edit: () => hasPermission([RoleConstants.ADMIN, RoleConstants.WORKSPACE_MANAGE, P.MODEL_RESOURCE_PERMISSION_EDIT], Compare.OR),
45+
},
3946
}

0 commit comments

Comments
 (0)