From bf347730b304cdad31a58a8f39613652a24644bc Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 7 Jan 2022 09:52:19 +0100 Subject: [PATCH] outposts/ldap: remove deprecated fields Signed-off-by: Jens Langhammer --- internal/outpost/ldap/entries.go | 6 +----- tests/e2e/test_provider_ldap.py | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/internal/outpost/ldap/entries.go b/internal/outpost/ldap/entries.go index 07843f724..043c1feeb 100644 --- a/internal/outpost/ldap/entries.go +++ b/internal/outpost/ldap/entries.go @@ -12,11 +12,7 @@ func (pi *ProviderInstance) UserEntry(u api.User) *ldap.Entry { attrs := utils.AKAttrsToLDAP(u.Attributes) attrs = utils.EnsureAttributes(attrs, map[string][]string{ - "memberOf": pi.GroupsForUser(u), - // Old fields for backwards compatibility - "accountStatus": {utils.BoolToString(*u.IsActive)}, - "superuser": {utils.BoolToString(u.IsSuperuser)}, - // End old fields + "memberOf": pi.GroupsForUser(u), "goauthentik.io/ldap/active": {utils.BoolToString(*u.IsActive)}, "goauthentik.io/ldap/superuser": {utils.BoolToString(u.IsSuperuser)}, "cn": {u.Username}, diff --git a/tests/e2e/test_provider_ldap.py b/tests/e2e/test_provider_ldap.py index dc018b1b6..7bb8fe23b 100644 --- a/tests/e2e/test_provider_ldap.py +++ b/tests/e2e/test_provider_ldap.py @@ -215,8 +215,6 @@ class TestProviderLDAP(SeleniumTestCase): "uidNumber": [str(2000 + o_user.pk)], "gidNumber": [str(2000 + o_user.pk)], "memberOf": [], - "accountStatus": ["true"], - "superuser": ["false"], "goauthentik.io/ldap/active": ["true"], "goauthentik.io/ldap/superuser": ["false"], "goauthentik.io/user/override-ips": ["true"], @@ -242,8 +240,6 @@ class TestProviderLDAP(SeleniumTestCase): "uidNumber": [str(2000 + embedded_account.pk)], "gidNumber": [str(2000 + embedded_account.pk)], "memberOf": [], - "accountStatus": ["true"], - "superuser": ["false"], "goauthentik.io/ldap/active": ["true"], "goauthentik.io/ldap/superuser": ["false"], "goauthentik.io/user/override-ips": ["true"], @@ -272,8 +268,6 @@ class TestProviderLDAP(SeleniumTestCase): f"cn={group.name},ou=groups,dc=ldap,dc=goauthentik,dc=io" for group in self.user.ak_groups.all() ], - "accountStatus": ["true"], - "superuser": ["true"], "goauthentik.io/ldap/active": ["true"], "goauthentik.io/ldap/superuser": ["true"], "extraAttribute": ["bar"],