Skip to content

Commit a5cda05

Browse files
zhanweizhang7zhanweizhang7
committed
feat: Permission update
1 parent 4205dc9 commit a5cda05

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

‎apps/application/views/application.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def put(self, request: Request, workspace_id: str, application_id: str):
187187
tags=[_('Application')] # type: ignore
188188
)
189189
@has_permissions(PermissionConstants.WORKSPACE_READ.get_workspace_application_permission(),
190-
RoleConstants.WORKSPACE_MANAGE.get_workspace_role())
190+
RoleConstants.WORKSPACE_MANAGE.get_workspace_role(), RoleConstants.ADMIN)
191191
def get(self, request: Request, workspace_id: str, application_id: str):
192192
return result.success(ApplicationOperateSerializer(
193193
data={'application_id': application_id, 'user_id': request.user.id}).one())

‎apps/system_manage/views/email_setting.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
@desc:
88
"""
99
from drf_spectacular.utils import extend_schema
10-
from networkx.algorithms.traversal import dfs_successors
1110
from rest_framework.request import Request
1211
from rest_framework.views import APIView
1312

1413
from common.auth import TokenAuth
1514
from common.auth.authentication import has_permissions
16-
from common.constants.permission_constants import PermissionConstants
15+
from common.constants.permission_constants import PermissionConstants, RoleConstants
1716

1817
from django.utils.translation import gettext_lazy as _
1918

@@ -56,7 +55,7 @@ class Email(APIView):
5655
tags=[_('Email Settings')]) # type: ignore
5756
@log(menu='Email settings', operate='Create or update email settings',
5857
get_details=get_email_details)
59-
@has_permissions(PermissionConstants.EMAIL_SETTING_EDIT)
58+
@has_permissions(PermissionConstants.EMAIL_SETTING_EDIT, RoleConstants.ADMIN)
6059
def put(self, request: Request):
6160
return result.success(
6261
EmailSettingSerializer.Create(
@@ -70,7 +69,7 @@ def put(self, request: Request):
7069
responses=DefaultModelResponse.get_response(),
7170
tags=[_('Email Settings')] # type: ignore
7271
)
73-
@has_permissions(PermissionConstants.EMAIL_SETTING_EDIT)
72+
@has_permissions(PermissionConstants.EMAIL_SETTING_EDIT, RoleConstants.ADMIN)
7473
@log(menu='Email settings', operate='Test email settings',
7574
get_details=get_email_details
7675
)
@@ -85,7 +84,7 @@ def post(self, request: Request):
8584
operation_id=_('Get email settings'), # type: ignore
8685
responses=DefaultModelResponse.get_response(),
8786
tags=[_('Email Settings')]) # type: ignore
88-
@has_permissions(PermissionConstants.EMAIL_SETTING_READ)
87+
@has_permissions(PermissionConstants.EMAIL_SETTING_READ, RoleConstants.ADMIN)
8988
def get(self, request: Request):
9089
return result.success(
9190
EmailSettingSerializer.one())

‎apps/users/views/user.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class TestPermissionsUserView(APIView):
7676
operation_id="测试",
7777
tags=[_("User Management")], # type: ignore
7878
responses=UserProfileAPI.get_response())
79-
@has_permissions(PermissionConstants.USER_EDIT)
79+
@has_permissions(PermissionConstants.USER_EDIT, RoleConstants.ADMIN)
8080
def get(self, request: Request):
8181
return result.success(UserProfileSerializer().profile(request.user, request.auth))
8282

@@ -108,7 +108,7 @@ class TestWorkspacePermissionUserView(APIView):
108108
tags=[_("User Management")], # type: ignore
109109
responses=UserProfileAPI.get_response(),
110110
parameters=TestWorkspacePermissionUserApi.get_parameters())
111-
@has_permissions(PermissionConstants.USER_EDIT.get_workspace_permission())
111+
@has_permissions(PermissionConstants.USER_EDIT.get_workspace_permission(), RoleConstants.ADMIN)
112112
def get(self, request: Request, workspace_id):
113113
return result.success(UserProfileSerializer().profile(request.user, request.auth))
114114

@@ -179,7 +179,7 @@ class Password(APIView):
179179
operation_id=_("Get default password"), # type: ignore
180180
tags=[_("User Management")], # type: ignore
181181
responses=UserPasswordResponse.get_response())
182-
@has_permissions(PermissionConstants.USER_CREATE)
182+
@has_permissions(PermissionConstants.USER_CREATE, RoleConstants.ADMIN)
183183
def get(self, request: Request):
184184
return result.success(data={'password': default_password})
185185

@@ -193,7 +193,7 @@ class Operate(APIView):
193193
tags=[_("User Management")], # type: ignore
194194
parameters=DeleteUserApi.get_parameters(),
195195
responses=DefaultModelResponse.get_response())
196-
@has_permissions(PermissionConstants.USER_DELETE)
196+
@has_permissions(PermissionConstants.USER_DELETE, RoleConstants.ADMIN)
197197
@log(menu='User management', operate='Delete user',
198198
get_operation_object=lambda r, k: get_user_operation_object(k.get('user_id')))
199199
def delete(self, request: Request, user_id):
@@ -206,7 +206,7 @@ def delete(self, request: Request, user_id):
206206
tags=[_("User Management")], # type: ignore
207207
request=DeleteUserApi.get_parameters(),
208208
responses=UserProfileAPI.get_response())
209-
@has_permissions(PermissionConstants.USER_READ)
209+
@has_permissions(PermissionConstants.USER_READ,RoleConstants.ADMIN)
210210
def get(self, request: Request, user_id):
211211
return result.success(UserManageSerializer.Operate(data={'id': user_id}).one(with_valid=True))
212212

@@ -218,7 +218,7 @@ def get(self, request: Request, user_id):
218218
parameters=DeleteUserApi.get_parameters(),
219219
request=EditUserApi.get_request(),
220220
responses=UserProfileAPI.get_response())
221-
@has_permissions(PermissionConstants.USER_EDIT)
221+
@has_permissions(PermissionConstants.USER_EDIT, RoleConstants.ADMIN)
222222
@log(menu='User management', operate='Update user information',
223223
get_operation_object=lambda r, k: get_user_operation_object(k.get('user_id')))
224224
def put(self, request: Request, user_id):
@@ -235,7 +235,7 @@ class BatchDelete(APIView):
235235
tags=[_("User Management")], # type: ignore
236236
request=DeleteUserApi.get_request(),
237237
responses=DefaultModelResponse.get_response())
238-
@has_permissions(PermissionConstants.USER_DELETE)
238+
@has_permissions(PermissionConstants.USER_DELETE, RoleConstants.ADMIN)
239239
@log(menu='User management', operate='Batch delete user',
240240
get_operation_object=lambda r, k: get_user_operation_object(k.get('user_id')))
241241
def post(self, request: Request):
@@ -269,7 +269,7 @@ class Page(APIView):
269269
tags=[_("User Management")], # type: ignore
270270
parameters=UserPageApi.get_parameters(),
271271
responses=UserPageApi.get_response())
272-
@has_permissions(PermissionConstants.USER_READ)
272+
@has_permissions(PermissionConstants.USER_READ,RoleConstants.ADMIN)
273273
def get(self, request: Request, current_page, page_size):
274274
d = UserManageSerializer.Query(
275275
data={'email_or_username': request.query_params.get('email_or_username', None),

0 commit comments

Comments
 (0)