diff --git a/uffd/oauth2/views.py b/uffd/oauth2/views.py index 33ced6a4536d54925f9995effec449dd4637eba4..a7d81d06d3ad533bb92b2b6cb1999f55425c0f6a 100644 --- a/uffd/oauth2/views.py +++ b/uffd/oauth2/views.py @@ -106,7 +106,6 @@ def userinfo(): nickname=user.loginname, email=user.mail, ldap_dn=user.dn, - ldap_uuid=user.uuid, groups=[group.name for group in user.get_groups()] ) diff --git a/uffd/user/models.py b/uffd/user/models.py index 56cc018deb86fdedc211cb656becc2974e2e15d2..5158b32305162f164178dee5618d9e21c44b9c6e 100644 --- a/uffd/user/models.py +++ b/uffd/user/models.py @@ -7,14 +7,13 @@ from flask import current_app from uffd import ldap class User(): - def __init__(self, uid=None, loginname='', displayname='', mail='', groups=None, dn=None, uuid=None): + def __init__(self, uid=None, loginname='', displayname='', mail='', groups=None, dn=None): self.uid = uid self.loginname = loginname self.displayname = displayname self.mail = mail self.newpassword = None self.dn = dn - self.uuid = uuid self.groups_ldap = groups or [] self.initial_groups_ldap = groups or [] @@ -30,7 +29,6 @@ class User(): mail=ldapobject['mail'].value, groups=ldap.get_ldap_array_attribute_safe(ldapobject, 'memberOf'), dn=ldapobject.entry_dn, - uuid=ldapobject['entryUUID'].value ) @classmethod