Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Methods / AdmRevokeRoleFromPerson.py

diff --git a/PLC/Methods/AdmRevokeRoleFromPerson.py b/PLC/Methods/AdmRevokeRoleFromPerson.py
index cb7c2df..2631a3a 100644 (file)
--- a/PLC/Methods/AdmRevokeRoleFromPerson.py
+++ b/PLC/Methods/AdmRevokeRoleFromPerson.py
@@ -1,67 +1,11 @@
-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.Roles import Roles
+from PLC.Methods.DeleteRoleFromPerson import DeleteRoleFromPerson
 
-class AdmRevokeRoleFromPerson(Method):
+class AdmRevokeRoleFromPerson(DeleteRoleFromPerson):
     """
-    Revokes the specified role from the person.
-    
-    PIs can only revoke the tech and user roles from users and techs
-    at their sites. Admins can revoke any role from any user.
-
-    Returns 1 if successful, faults otherwise.
+    Deprecated. See DeleteRoleFromPerson.
     """
 
-    roles = ['admin', 'pi']
-
-    accepts = [
-        PasswordAuth(),
-        Mixed(Person.fields['person_id'],
-              Person.fields['email']),
-        Mixed(Parameter(int, "Role identifier"),
-              Parameter(str, "Role name"))
-        ]
-
-    returns = Parameter(int, '1 if successful')
+    status = "deprecated"
 
     def call(self, auth, person_id_or_email, role_id_or_name):
-        # 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]
-
-        # Get account information
-        persons = Persons(self.api, [person_id_or_email])
-        if not persons:
-            raise PLCInvalidArgument, "No such account"
-
-        person = persons.values()[0]
-
-        # Authenticated function
-        assert self.caller is not None
-
-        # Check if we can update this account
-        if not self.caller.can_update(person):
-            raise PLCPermissionDenied, "Not allowed to update specified account"
-
-        # Can only revoke lesser (higher) roles from others
-        if 'admin' not in self.caller['roles'] and \
-           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)
-
-        return 1
+        return DeleteRoleFromPerson.call(self, auth, role_id_or_name, person_id_or_email)