ERP5Security.ERP5UserManager: do not include users that are covered by ERP5LoginUserManager.

product/ERP5Security/ERP5UserManager.py

@@ -148,12 +148,12 @@ class ERP5UserManager(BasePlugin):
       if not login or not (password or ignore_password):
         return None
 
-      user_list = self.getUserByLogin(login)
+      user_list = self.enumerateUsers(login=login)
 
       if not user_list:
         raise _AuthenticationFailure()
 
-      user = user_list[0]
+      user = self.getPortalObject().unrestrictedTraverse(user_list[0]['path'])
 
       try:
 
@@ -221,8 +221,9 @@ class ERP5UserManager(BasePlugin):
     if isinstance(id, str):
       id = (id,)
 
-    unrestrictedSearchResults = self.getPortalObject(
-      ).portal_catalog.unrestrictedSearchResults
+    portal = self.getPortalObject()
+    unrestrictedSearchResults = portal.portal_catalog.unrestrictedSearchResults
+    unrestrictedTraverse = portal.unrestrictedTraverse
     searchUser = lambda **kw: unrestrictedSearchResults(
       select_list=('reference', ),
       portal_type='Person',
@@ -252,7 +253,8 @@ class ERP5UserManager(BasePlugin):
           },
           limit=max_results,
         )
-        if requested(x['reference'])
+        if requested(x['reference']) and not unrestrictedTraverse(
+            x['path']).objectValues(portal_type=self.getPortalLoginTypeList())
       ]
     else:
       user_list = []