globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

lazy group loading

Browse source
This commit is contained in:
Éloi Rivard 2021-12-06 14:52:10 +01:00
parent 02c626129d
commit 57e4830c82
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
canaille/models.py
View file

@ -31,7 +31,6 @@ class User(LDAPObject):
user = super().get(dn, filter, conn) user = super().get(dn, filter, conn)
if user: if user:
user.load_permissions(conn) user.load_permissions(conn)
user.load_groups(conn=conn)
return user return user

1
tests/test_groups.py
View file

@ -12,6 +12,7 @@ def test_set_groups(app, slapd_connection, user, foo_group, bar_group):
User.attr_type_by_name(conn=slapd_connection) User.attr_type_by_name(conn=slapd_connection)
user = User.get(dn=user.dn, conn=slapd_connection) user = User.get(dn=user.dn, conn=slapd_connection)
user.load_groups(conn=slapd_connection)
assert set(Group.available_groups(conn=slapd_connection)) == { assert set(Group.available_groups(conn=slapd_connection)) == {
("foo", foo_group.dn), ("foo", foo_group.dn),
("bar", bar_group.dn), ("bar", bar_group.dn),

4
tests/test_profile.py
View file

@ -32,6 +32,8 @@ def test_edition(
with testclient.app.app_context(): with testclient.app.app_context():
logged_user = User.get(dn=logged_user.dn, conn=slapd_connection) logged_user = User.get(dn=logged_user.dn, conn=slapd_connection)
logged_user.load_groups(conn=slapd_connection)
assert ["user"] == logged_user.uid assert ["user"] == logged_user.uid
assert ["given_name"] == logged_user.givenName assert ["given_name"] == logged_user.givenName
assert ["family_name"] == logged_user.sn assert ["family_name"] == logged_user.sn
@ -217,6 +219,7 @@ def test_user_creation_edition_and_deletion(
res = res.form.submit(name="action", value="edit", status=302).follow(status=200) res = res.form.submit(name="action", value="edit", status=302).follow(status=200)
with testclient.app.app_context(): with testclient.app.app_context():
george = User.get("george", conn=slapd_connection) george = User.get("george", conn=slapd_connection)
george.load_groups(conn=slapd_connection)
assert "George" == george.givenName[0] assert "George" == george.givenName[0]
assert george.groups == [] assert george.groups == []
assert george.check_password("totoyolo") assert george.check_password("totoyolo")
@ -234,6 +237,7 @@ def test_user_creation_edition_and_deletion(
res = res.form.submit(name="action", value="edit", status=200) res = res.form.submit(name="action", value="edit", status=200)
with testclient.app.app_context(): with testclient.app.app_context():
george = User.get("george", conn=slapd_connection) george = User.get("george", conn=slapd_connection)
george.load_groups(conn=slapd_connection)
assert "Georgio" == george.givenName[0] assert "Georgio" == george.givenName[0]
assert george.check_password("totoyolo") assert george.check_password("totoyolo")