Changeset 912b9a in indico

Timestamp:

06/07/10 18:31:06 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

971b24

Parents:

390c35

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (06/01/10 11:37:25)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (06/07/10 18:31:06)

Message:

[FIX] Vidyo: Auth manager - simplified code

• Clearer and simpler;

Location:

indico/MaKaC

Files:

• authentication/AuthenticationMgr.py (modified) (2 diffs)
• plugins/Collaboration/Vidyo/common.py (modified) (1 diff)

indico/MaKaC/authentication/AuthenticationMgr.py

@@ -78 +78 @@
         return None
 
-    def getAvatarByLogin(self, login, authenticator = None):
+    def getAvatarByLogin(self, login, auth = None):
         """ Returns an Avatar object based on the person's login.
-            If authenticator is set, we will only look in the given authenticator.
-            If not set, we will look in all autheticators.
+            If authList is set, we will only look in the given authenticators.
+            If not set, we will look in all authenticators.
             If we find this login in more than one authenticator, and there is at least 2
             different Avatar objects, we will return a dictionary authenticatorName:Avatar object.
@@ -89 +89 @@
             :type login: str
 
-            :param login: the name of an authenticator to use, or a list of authenticator names, or None
-            :type login: str, list or NoneType
+            :param auth: a list of names of the authenticators to use, or None
+            :type auth: str, list or NoneType
         """
 
-        if type(authenticator) is str:
-            #only one authenticator
-            auth = self.getById(authenticator)
+        if auth == None:
+            # search all authenticators
+            authList = self.AuthenticatorList
+        else:
+            # get the actual Authenticator objects
+            authList = list(self.getById(a) for a in auth)
+
+        # we search for Avatars in each authenticator
+        foundAvatars = {}
+        for auth in authList:
             try:
-                return auth.getAvatarByLogin(login)
+                avatar = auth.getAvatarByLogin(login)
+                foundAvatars[auth.getId().strip()] = avatar
             except KeyError:
-                return None
+                pass
 
-        else:
-            #multiple authenticators, we build a list of authenticators
-            if type(authenticator) is list:
-                authenticatorList = []
-                for authName in authenticator:
-                    authenticatorList.append(self.getById(authName))
-            else:
-                authenticatorList = self.AuthenticatorList
-
-            #we search for Avatars in each authenticator
-            foundAvatars = {}
-            avatarIdsFound = set()
-            for auth in authenticatorList:
-                try:
-                    avatar = auth.getAvatarByLogin(login)
-                    foundAvatars[auth.getId().strip()] = avatar
-                    avatarIdsFound.add(avatar.getId())
-                except KeyError:
-                    pass
-
-            if foundAvatars:
-                if len(foundAvatars) == 1 or len(avatarIdsFound) == 1:
-                    #there's only one different avatar
-                    return foundAvatars.values()[0]
-                else:
-                    #there's more than 1 avatar, we return a dictionary
-                    return foundAvatars
-            else:
-                #we found nothing, we return None
-                return None
-
+        return foundAvatars
 
     def isLoginFree( self, login):

indico/MaKaC/plugins/Collaboration/Vidyo/common.py

@@ -146 +146 @@
     @classmethod
     def getAvatarByAccountName(cls, accountName):
-        authenticatorsToUse = getVidyoOptionValue("authenticatorList")
-
-        foundAvatar = AuthenticatorMgr().getAvatarByLogin(accountName, authenticatorsToUse)
-        if foundAvatar:
-            if type(foundAvatar) is dict:
-                for authenticatorName in authenticatorsToUse:
-                    if authenticatorName in foundAvatar:
-                        foundAvatar = foundAvatar[authenticatorName]
-                        break
-            return foundAvatar
+        """
+        Retrieves the first avatar found using the authenticators in the
+        authenticatorList option (order is respected)
+        """
+        availableAuths = getVidyoOptionValue("authenticatorList")
+        foundAvatarDict = AuthenticatorMgr().getAvatarByLogin(accountName, availableAuths)
+
+        for authName in availableAuths:
+            foundAvatar = foundAvatarDict.get(authName, None)
+            if foundAvatar:
+                return foundAvatar
         else:
             return None