X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FAdmIsPersonInRole.py;h=b32ab03528624d2f9657346326a1748d7a4b1fbd;hb=3daa504f34faa18a1a399662e237d236e5ec2ae4;hp=24a005927034979d6d9b3004d55cf8c54a7aed1c;hpb=a8e81964a7b22a0584667a0449604cccc895955a;p=plcapi.git

diff --git a/PLC/Methods/AdmIsPersonInRole.py b/PLC/Methods/AdmIsPersonInRole.py
index 24a0059..b32ab03 100644
--- a/PLC/Methods/AdmIsPersonInRole.py
+++ b/PLC/Methods/AdmIsPersonInRole.py
@@ -1,24 +1,26 @@
-from types import StringTypes
-
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.Roles import Role, Roles
 
 class AdmIsPersonInRole(Method):
     """
+    Deprecated. Functionality can be implemented with GetPersons.
+
     Returns 1 if the specified account has the specified role, 0
     otherwise. This function differs from AdmGetPersonRoles() in that
     any authorized user can call it. It is currently restricted to
     verifying PI roles.
     """
 
+    status = "deprecated"
+
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
         Mixed(Parameter(int, "Role identifier"),
@@ -27,8 +29,6 @@ class AdmIsPersonInRole(Method):
 
     returns = Parameter(int, "1 if account has role, 0 otherwise")
 
-    status = "useless"
-
     def call(self, auth, person_id_or_email, role_id_or_name):
         # This is a totally fucked up function. I have no idea why it
         # exists or who calls it, but here is how it is supposed to
@@ -36,9 +36,9 @@ class AdmIsPersonInRole(Method):
 
         # Only allow PI roles to be checked
         roles = {}
-        for role_id, role in Roles(self.api).iteritems():
-            roles[role_id] = role['name']
-            roles[role['name']] = role_id
+        for role in Roles(self.api):
+            roles[role['role_id']] = role['name']
+            roles[role['name']] = role['role_id']
 
         if role_id_or_name not in roles:
             raise PLCInvalidArgument, "Invalid role identifier or name"
@@ -59,7 +59,7 @@ class AdmIsPersonInRole(Method):
         if not persons:
             return 0
 
-        person = persons.values()[0]
+        person = persons[0]
 
         if role_id in person['role_ids']:
             return 1