Skip to content
Snippets Groups Projects
Commit 34ad169c authored by Julian's avatar Julian
Browse files

Revert "added ldap uuid to user object and oauth userinfo endpoint"

This reverts commit a827f27b.
parent 59682bf4
No related branches found
No related tags found
No related merge requests found
...@@ -106,7 +106,6 @@ def userinfo(): ...@@ -106,7 +106,6 @@ def userinfo():
nickname=user.loginname, nickname=user.loginname,
email=user.mail, email=user.mail,
ldap_dn=user.dn, ldap_dn=user.dn,
ldap_uuid=user.uuid,
groups=[group.name for group in user.get_groups()] groups=[group.name for group in user.get_groups()]
) )
......
...@@ -7,14 +7,13 @@ from flask import current_app ...@@ -7,14 +7,13 @@ from flask import current_app
from uffd import ldap from uffd import ldap
class User(): 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.uid = uid
self.loginname = loginname self.loginname = loginname
self.displayname = displayname self.displayname = displayname
self.mail = mail self.mail = mail
self.newpassword = None self.newpassword = None
self.dn = dn self.dn = dn
self.uuid = uuid
self.groups_ldap = groups or [] self.groups_ldap = groups or []
self.initial_groups_ldap = groups or [] self.initial_groups_ldap = groups or []
...@@ -30,7 +29,6 @@ class User(): ...@@ -30,7 +29,6 @@ class User():
mail=ldapobject['mail'].value, mail=ldapobject['mail'].value,
groups=ldap.get_ldap_array_attribute_safe(ldapobject, 'memberOf'), groups=ldap.get_ldap_array_attribute_safe(ldapobject, 'memberOf'),
dn=ldapobject.entry_dn, dn=ldapobject.entry_dn,
uuid=ldapobject['entryUUID'].value
) )
@classmethod @classmethod
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment