Commit caefbddd authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

ERP5Security.ERP5LoginUserManager: enumerateUsers() should not include Persons without any Login.

Before it raised an exception if called with id=(A, B) where A has Login and B has no Login.
parent a53cff31
...@@ -224,7 +224,7 @@ class ERP5LoginUserManager(BasePlugin): ...@@ -224,7 +224,7 @@ class ERP5LoginUserManager(BasePlugin):
'id': user['reference'], 'id': user['reference'],
# Note: PAS forbids us from returning more than one entry per given id, # Note: PAS forbids us from returning more than one entry per given id,
# so take any available login. # so take any available login.
'login': login_dict.get(user['uid'], [None])[0]['reference'], 'login': login_dict[user['uid']][0]['reference'],
'pluginid': plugin_id, 'pluginid': plugin_id,
# Extra properties, specific to ERP5 # Extra properties, specific to ERP5
...@@ -235,10 +235,10 @@ class ERP5LoginUserManager(BasePlugin): ...@@ -235,10 +235,10 @@ class ERP5LoginUserManager(BasePlugin):
'path': login['path'], 'path': login['path'],
'uid': login['uid'], 'uid': login['uid'],
} }
for login in login_dict.get(user['uid'], []) for login in login_dict[user['uid']]
], ],
} }
for user in user_list for user in user_list if login_dict.get(user['uid'], [])
]) ])
classImplements(ERP5LoginUserManager, IAuthenticationPlugin, IUserEnumerationPlugin) classImplements(ERP5LoginUserManager, IAuthenticationPlugin, IUserEnumerationPlugin)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment