Skip to content

[17.0][FIX] users_ldap_populate: do not deactivate portal users #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvinh wants to merge 1 commit into
base: 17.0
Choose a base branch
from
Open

[17.0][FIX] users_ldap_populate: do not deactivate portal users #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion users_ldap_populate/models/users_ldap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ def do_deactivate_unknown_users(self, known_user_ids):
users = (
self.env["res.users"]
.sudo()
.search([("id", "not in", known_user_ids)], order="login")
.search(
[("id", "not in", known_user_ids), ("share", "=", False)], order="login"
)
)
ldap_confs = self._get_ldap_dicts()
for unknown_user in users:
Expand Down
9 changes: 7 additions & 2 deletions users_ldap_populate/tests/test_users_ldap_populate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ def get_fake_ldap(self):
class TestUsersLdapPopulate(TransactionCase):
def test_users_ldap_populate(self):
previous_users_count = self.env["res.users"].search_count([])
previous_portal_users_count = self.env["res.users"].search_count(
[("share", "=", True)]
)
with patch_ldap(
self,
[
Expand All @@ -82,10 +85,12 @@ def test_users_ldap_populate(self):
)
self.assertEqual(ldap_populate_wizard.users_created, 1)
self.assertEqual(
ldap_populate_wizard.users_deactivated, previous_users_count - 1
) # Admin is not deactivated
ldap_populate_wizard.users_deactivated,
previous_users_count - 1 - previous_portal_users_count,
) # Admin is not deactivated, portal users are not deactivated
self.assertFalse(self.env.ref("base.user_demo").active)
self.assertTrue(self.env.ref("base.user_admin").active)
self.assertTrue(self.env.ref("base.public_user").active)
self.assertTrue(self.env["res.users"].search([("login", "=", "fake")]))

def test_users_ldap_populate_reactivate(self):
Expand Down
Loading