diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index 2eb0f0a0909..0a3214e9b42 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -897,6 +897,9 @@ def set_user_groups(user_id, instance): for group_id in user_group_ids ) + version = Cache_Version.PERMISSION_LIST.get_version() + cache.delete(Cache_Version.PERMISSION_LIST.get_key(user_id=user_id), version=version) + return None diff --git a/apps/users/serializers/user_group.py b/apps/users/serializers/user_group.py index c903baadb4c..d2bee27047e 100644 --- a/apps/users/serializers/user_group.py +++ b/apps/users/serializers/user_group.py @@ -2,12 +2,14 @@ import uuid_utils.compat as uuid from collections import defaultdict +from django.core.cache import cache from django.db import transaction from django.db.models import Count from django.utils.translation import gettext_lazy as _ from rest_framework import serializers from common.auth.constants.role_constants import RoleConstants +from common.constants.cache_version import Cache_Version from common.database_model_manage.database_model_manage import DatabaseModelManage from common.db.search import page_search from common.exception.app_exception import AppApiException, NotFound404 @@ -15,6 +17,15 @@ from users.models.user_group import SystemUserGroup, SystemUserGroupRelation +def _clear_permission_cache(user_ids): + """Invalidate the cached permission list for users whose group membership changed.""" + if not user_ids: + return + version = Cache_Version.PERMISSION_LIST.get_version() + for user_id in user_ids: + cache.delete(Cache_Version.PERMISSION_LIST.get_key(user_id=user_id), version=version) + + @transaction.atomic def add_or_edit_user_group_relation(user, user_group_ids): UserGroupRelation.objects.filter(user=user).delete() @@ -99,7 +110,11 @@ def delete(self, *, with_valid=True): if with_valid: self.is_valid(raise_exception=True) + member_user_ids = list( + SystemUserGroupRelation.objects.filter(group_id=self.group.id).values_list("user_id", flat=True) + ) self.group.delete() + _clear_permission_cache(member_user_ids) return True class Query(serializers.Serializer): @@ -181,6 +196,7 @@ def add_member(self, with_valid=True): for user_id in to_add ] ) + _clear_permission_cache(to_add) return True @@ -206,11 +222,14 @@ def remove_member(self, with_valid=True): self.is_valid(raise_exception=True) data = self.validated_data relation_ids = data["group_relation_ids"] - SystemUserGroupRelation.objects.filter( + relations = SystemUserGroupRelation.objects.filter( id__in=relation_ids, group_id=data["id"], group__workspace_id=data["workspace_id"], - ).delete() + ) + user_ids = list(relations.values_list("user_id", flat=True)) + relations.delete() + _clear_permission_cache(user_ids) return True