Skip to content

Commit e1da951

Browse files
committed
chore: update permission checks and add user_id to system API key operations
--story=1020414 --user=王孝刚 【系统】-X-Pack 系统API Key 按用户隔离,每个用户都有自己的API KEY https://www.tapd.cn/62980211/s/1812186
1 parent 0d5c4dc commit e1da951

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

apps/common/constants/permission_constants.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,10 @@ class Operate(Enum):
178178
TO_CHAT = "READ+TO_CHAT" # 去对话
179179
SETTING = "READ+SETTING" # 管理
180180
DOWNLOAD = "READ+DOWNLOAD" # 下载
181-
AUTH = "READ+AUTH" # 资源授权
182-
TAG = "READ+TAG" # 标签设置
183-
REPLACE = "READ+REPLACE" # 标签设置
184-
UPDATE = "READ+UPDATE" # 更新license
181+
AUTH = "READ+AUTH" # 资源授权
182+
TAG = "READ+TAG" # 标签设置
183+
REPLACE = "READ+REPLACE" # 标签设置
184+
UPDATE = "READ+UPDATE" # 更新license
185185

186186

187187
class RoleGroup(Enum):
@@ -409,6 +409,7 @@ def get_workspace_role(self):
409409
# SystemGroup.RESOURCE.value: _("Resource"),
410410
}
411411

412+
412413
class Permission:
413414
"""
414415
权限信息
@@ -1036,10 +1037,10 @@ class PermissionConstants(Enum):
10361037
label=_('About')
10371038
)
10381039
ABOUT_UPDATE = Permission(group=Group.OTHER, operate=Operate.UPDATE,
1039-
role_list=[RoleConstants.ADMIN],
1040-
parent_group=[SystemGroup.OTHER],
1041-
label=_('Update License')
1042-
)
1040+
role_list=[RoleConstants.ADMIN],
1041+
parent_group=[SystemGroup.OTHER],
1042+
label=_('Update License')
1043+
)
10431044
SWITCH_LANGUAGE = Permission(group=Group.OTHER, operate=Operate.EDIT,
10441045
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
10451046
parent_group=[SystemGroup.OTHER, WorkspaceGroup.OTHER, UserGroup.OTHER],
@@ -1052,8 +1053,8 @@ class PermissionConstants(Enum):
10521053
)
10531054

10541055
SYSTEM_API_KEY_EDIT = Permission(group=Group.OTHER, operate=Operate.DELETE,
1055-
role_list=[RoleConstants.ADMIN],
1056-
parent_group=[SystemGroup.OTHER],
1056+
role_list=[RoleConstants.ADMIN, RoleConstants.USER],
1057+
parent_group=[SystemGroup.OTHER, WorkspaceGroup.OTHER, UserGroup.OTHER],
10571058
label=_('System API Key')
10581059
)
10591060

0 commit comments

Comments
 (0)