diff --git a/uffd/oauth2/views.py b/uffd/oauth2/views.py index 9ebacb26e5e1c622bf3bdd3cf173cec42d645169..586b11d9f87f3b18b54f713a3070cc279dd07df9 100644 --- a/uffd/oauth2/views.py +++ b/uffd/oauth2/views.py @@ -103,6 +103,7 @@ 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 5158b32305162f164178dee5618d9e21c44b9c6e..56cc018deb86fdedc211cb656becc2974e2e15d2 100644 --- a/uffd/user/models.py +++ b/uffd/user/models.py @@ -7,13 +7,14 @@ from flask import current_app from uffd import ldap class User(): - def __init__(self, uid=None, loginname='', displayname='', mail='', groups=None, dn=None): + def __init__(self, uid=None, loginname='', displayname='', mail='', groups=None, dn=None, uuid=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 [] @@ -29,6 +30,7 @@ class User(): mail=ldapobject['mail'].value, groups=ldap.get_ldap_array_attribute_safe(ldapobject, 'memberOf'), dn=ldapobject.entry_dn, + uuid=ldapobject['entryUUID'].value ) @classmethod