X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=PLC%2FMethods%2FDeleteRoleFromPerson.py;h=009b0b270065a9ae8d6e6c488ecf32238c27fb86;hb=12d17e7f285289f67146404be7bfe8862daf731c;hp=a1333675c2cc51135325061dc6c20d4504ddc42a;hpb=8b088994273084c8d761be5ee836c18cdb108d2e;p=plcapi.git

diff --git a/PLC/Methods/DeleteRoleFromPerson.py b/PLC/Methods/DeleteRoleFromPerson.py
index a133367..009b0b2 100644
--- a/PLC/Methods/DeleteRoleFromPerson.py
+++ b/PLC/Methods/DeleteRoleFromPerson.py
@@ -2,7 +2,7 @@ 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 DeleteRoleFromPerson(Method):
@@ -18,7 +18,7 @@ class DeleteRoleFromPerson(Method):
     roles = ['admin', 'pi']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Role.fields['role_id'],
               Role.fields['name']),
         Mixed(Person.fields['person_id'],
@@ -27,27 +27,22 @@ class DeleteRoleFromPerson(Method):
 
     returns = Parameter(int, '1 if successful')
 
-    def call(self, auth, role_id_or_name, person_id_or_email):
-        # Get all roles
-        roles = {}
-        for role_id, role in Roles(self.api).iteritems():
-            roles[role_id] = role['name']
-            roles[role['name']] = role_id
-
-        if role_id_or_name not in roles:
-            raise PLCInvalidArgument, "Invalid role identifier or name"
 
-        if isinstance(role_id_or_name, int):
-            role_id = role_id_or_name
-        else:
-            role_id = roles[role_id_or_name]
+    def call(self, auth, role_id_or_name, person_id_or_email):
+        # Get role
+        roles = Roles(self.api, [role_id_or_name])
+        if not roles:
+            raise PLCInvalidArgument, "Invalid role '%s'" % unicode(role_id_or_name)
+        role = roles[0]
 
         # Get account information
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
+        person = persons[0]
 
-        person = persons.values()[0]
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
 
         # Authenticated function
         assert self.caller is not None
@@ -58,10 +53,15 @@ class DeleteRoleFromPerson(Method):
 
         # Can only revoke lesser (higher) roles from others
         if 'admin' not in self.caller['roles'] and \
-           role_id <= min(self.caller['role_ids']):
+           role['role_id'] <= min(self.caller['role_ids']):
             raise PLCPermissionDenied, "Not allowed to revoke that role"
 
-        if role_id in person['role_ids']:
-            person.remove_role(role_id)
+        if role['role_id'] in person['role_ids']:
+            person.remove_role(role)
+	
+	# Logging variables
+	self.object_ids = [person['person_id']]
+	self.message = "Role %d revoked from person %d" % \
+                       (role['role_id'], person['person_id'])
 
         return 1