diff --git a/oidc_ldap_bridge/ldaputils.py b/oidc_ldap_bridge/ldaputils.py index 5d74cc23..28001b96 100644 --- a/oidc_ldap_bridge/ldaputils.py +++ b/oidc_ldap_bridge/ldaputils.py @@ -16,8 +16,8 @@ class LDAPObject: self.attrs = {} self.changes = {} - if hasattr(self, "objectClass") and not "objectClass" in kwargs: - kwargs["objectClass"] = self.objectClass + if hasattr(self, "object_class") and not "objectClass" in kwargs: + kwargs["objectClass"] = self.object_class for k, v in kwargs.items(): self.attrs[k] = [v] if not isinstance(v, list) else v @@ -199,8 +199,8 @@ class LDAPObject: def filter(cls, base=None, conn=None, **kwargs): conn = conn or cls.ldap() class_filter = ( - "".join([f"(objectClass={oc})" for oc in cls.objectClass]) - if hasattr(cls, "objectClass") + "".join([f"(objectClass={oc})" for oc in cls.object_class]) + if hasattr(cls, "object_class") else None ) arg_filter = "" diff --git a/oidc_ldap_bridge/models.py b/oidc_ldap_bridge/models.py index c9cd5cf0..28dce888 100644 --- a/oidc_ldap_bridge/models.py +++ b/oidc_ldap_bridge/models.py @@ -69,7 +69,7 @@ class User(LDAPObject): class Client(LDAPObject, ClientMixin): - objectClass = ["oauthClient"] + object_class = ["oauthClient"] base = "ou=clients,ou=oauth" id = "oauthClientID" @@ -138,7 +138,7 @@ class Client(LDAPObject, ClientMixin): class AuthorizationCode(LDAPObject, AuthorizationCodeMixin): - objectClass = ["oauthAuthorizationCode"] + object_class = ["oauthAuthorizationCode"] base = "ou=authorizations,ou=oauth" id = "oauthCode" @@ -174,7 +174,7 @@ class AuthorizationCode(LDAPObject, AuthorizationCodeMixin): class Token(LDAPObject, TokenMixin): - objectClass = ["oauthToken"] + object_class = ["oauthToken"] base = "ou=tokens,ou=oauth" id = "oauthAccessToken" @@ -218,7 +218,7 @@ class Token(LDAPObject, TokenMixin): class Consent(LDAPObject): - objectClass = ["oauthConsent"] + object_class = ["oauthConsent"] base = "ou=consents,ou=oauth" id = "cn"