paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 10:57:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

user_groups: Do not allow updating memberships of deactivated users.

Browse Source 
This commit updates backend code to not allow adding deactivated
users to groups including when creating groups and also to not
allow removing deactivated users from groups.
This commit is contained in:
Sahil Batra
2024-03-28 19:04:47 +05:30
committed by Tim Abbott
parent 320081ccd6
commit 4784c71bf9
8 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/users.py
View File

@@ -234,13 +234,14 @@ def bulk_get_cross_realm_bots() -> dict[str, UserProfile]:
return {user.email.lower(): user for user in users}
def user_ids_to_users(user_ids: Sequence[int], realm: Realm) -> list[UserProfile]:
# TODO: Consider adding a flag to control whether deactivated
# users should be included.
def user_ids_to_users(
user_ids: Sequence[int], realm: Realm, *, allow_deactivated: bool
) -> list[UserProfile]:
user_query = UserProfile.objects.filter(id__in=user_ids, realm=realm)
if not allow_deactivated:
user_query = user_query.filter(is_active=True)
user_profiles = list(
UserProfile.objects.filter(id__in=user_ids, realm=realm).select_related("realm")
)
user_profiles = list(user_query.select_related("realm"))
found_user_ids = {user_profile.id for user_profile in user_profiles}