From 34ad169c8c1bf12a4d488ed6cd5437ab1a4a643a Mon Sep 17 00:00:00 2001 From: Julian Rother <julianr@fsmpi.rwth-aachen.de> Date: Thu, 26 Nov 2020 15:38:06 +0100 Subject: [PATCH] Revert "added ldap uuid to user object and oauth userinfo endpoint" This reverts commit a827f27bebc5a795ae4fd1abc382427666a7b527. --- uffd/oauth2/views.py | 1 - uffd/user/models.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/uffd/oauth2/views.py b/uffd/oauth2/views.py index 33ced6a4..a7d81d06 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 56cc018d..5158b323 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 -- GitLab