Skip to content

Commit f186b25

Browse files
committed
refactor: streamline permission handling and remove unused cache logic in tool management
1 parent c8d901b commit f186b25

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

apps/tools/serializers/tool.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import uuid_utils.compat as uuid
99
from django.core import validators
10-
from django.core.cache import cache
1110
from django.db import transaction
1211
from django.db.models import QuerySet, Q
1312
from django.http import HttpResponse
@@ -16,8 +15,6 @@
1615
from pylint.reporters import JSON2Reporter
1716
from rest_framework import serializers, status
1817

19-
from common.constants.cache_version import Cache_Version
20-
from common.constants.permission_constants import ResourceAuthType, ResourcePermission
2118
from common.database_model_manage.database_model_manage import DatabaseModelManage
2219
from common.db.search import page_search, native_page_search
2320
from common.exception.app_exception import AppApiException
@@ -512,19 +509,11 @@ def add(self, instance, with_valid=True):
512509
tool.save()
513510

514511
# 自动授权给创建者
515-
WorkspaceUserResourcePermission(
516-
target=tool_id,
517-
auth_target_type=AuthTargetType.TOOL,
518-
permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE],
519-
workspace_id=self.data.get('workspace_id'),
520-
user_id=self.data.get('user_id'),
521-
auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP
522-
).save()
523-
524-
# 刷新缓存
525-
version = Cache_Version.PERMISSION_LIST.get_version()
526-
key = Cache_Version.PERMISSION_LIST.get_key(user_id=self.data.get('user_id'))
527-
cache.delete(key, version=version)
512+
UserResourcePermissionSerializer(data={
513+
'workspace_id': self.data.get('workspace_id'),
514+
'user_id': self.data.get('user_id'),
515+
'auth_target_type': AuthTargetType.TOOL.value
516+
}).auth_resource(str(tool_id))
528517

529518
return ToolModelSerializer(tool).data
530519

0 commit comments

Comments
 (0)