paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Make acting_user a mandatory kwarg for do_deactivate_user.

Browse Source
This commit is contained in:
shanukun
2021-03-27 10:32:12 +05:30
committed by Tim Abbott
parent 8f3ae715c0
commit c95061e9b9
16 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zproject/backends.py
View File

@@ -903,7 +903,7 @@ class ZulipLDAPUserPopulator(ZulipLDAPAuthBackendBase):
"Deactivating user %s because they are disabled in LDAP.",
user.delivery_email,
)
do_deactivate_user(user)
do_deactivate_user(user, acting_user=None)
# Do an early return to avoid trying to sync additional data.
return (user, built)
elif not user.is_active:
@@ -949,7 +949,7 @@ def sync_user_from_ldap(user_profile: UserProfile, logger: logging.Logger) -> bo
if settings.LDAP_DEACTIVATE_NON_MATCHING_USERS is None
else settings.LDAP_DEACTIVATE_NON_MATCHING_USERS
):
do_deactivate_user(user_profile)
do_deactivate_user(user_profile, acting_user=None)
logger.info("Deactivated non-matching user: %s", user_profile.delivery_email)
return True
elif user_profile.is_active: