From 006b2acd5dc94cec65efd84e125bcb6e4970436f Mon Sep 17 00:00:00 2001 From: Zixuan James Li Date: Fri, 16 Jun 2023 22:30:12 -0400 Subject: [PATCH] user_groups: Make acting user requried for deletion. When doing a checked deletion, the acting user is always required. It is effectively the user_profile parameter we had been previously requiring. --- zerver/actions/user_groups.py | 8 +++----- zerver/tests/test_events.py | 2 +- zerver/views/user_groups.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/zerver/actions/user_groups.py b/zerver/actions/user_groups.py index a9ca6c57b5..c55b0503a0 100644 --- a/zerver/actions/user_groups.py +++ b/zerver/actions/user_groups.py @@ -402,12 +402,10 @@ def do_send_delete_user_group_event(realm: Realm, user_group_id: int, realm_id: send_event(realm, event, active_user_ids(realm_id)) -def check_delete_user_group( - user_group_id: int, user_profile: UserProfile, *, acting_user: Optional[UserProfile] -) -> None: - user_group = access_user_group_by_id(user_group_id, user_profile, for_read=False) +def check_delete_user_group(user_group_id: int, *, acting_user: UserProfile) -> None: + user_group = access_user_group_by_id(user_group_id, acting_user, for_read=False) user_group.delete() - do_send_delete_user_group_event(user_profile.realm, user_group_id, user_profile.realm.id) + do_send_delete_user_group_event(acting_user.realm, user_group_id, acting_user.realm.id) @transaction.atomic(savepoint=False) diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 168d676acf..0f87fe14eb 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1464,7 +1464,7 @@ class NormalActionsTest(BaseAction): # Test remove event events = self.verify_action( - lambda: check_delete_user_group(backend.id, othello, acting_user=None) + lambda: check_delete_user_group(backend.id, acting_user=othello) ) check_user_group_remove("events[0]", events[0]) diff --git a/zerver/views/user_groups.py b/zerver/views/user_groups.py index 593b581202..27d6af1ec1 100644 --- a/zerver/views/user_groups.py +++ b/zerver/views/user_groups.py @@ -153,7 +153,7 @@ def delete_user_group( user_profile: UserProfile, user_group_id: int = REQ(json_validator=check_int, path_only=True), ) -> HttpResponse: - check_delete_user_group(user_group_id, user_profile, acting_user=user_profile) + check_delete_user_group(user_group_id, acting_user=user_profile) return json_success(request)