Merge from HEAD. Signed off by tmack.

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

diff --git a/PLC/Methods/AdmGrantRoleToPerson.py b/PLC/Methods/AdmGrantRoleToPerson.py
index 973d107..36e2e25 100644 (file)
--- a/PLC/Methods/AdmGrantRoleToPerson.py
+++ b/PLC/Methods/AdmGrantRoleToPerson.py
@@ -1,63 +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.AddRoleToPerson import AddRoleToPerson
 
-class AdmGrantRoleToPerson(Method):
+class AdmGrantRoleToPerson(AddRoleToPerson):
     """
-    Grants the specified role to the person.
-    
-    PIs can only grant the tech and user roles to users and techs at
-    their sites. Admins can grant any role to any user.
-
-    Returns 1 if successful, faults otherwise.
+    Deprecated. See AddRoleToPerson.
     """
 
-    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 = Roles(self.api)
-        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 grant lesser (higher) roles to others
-        if 'admin' not in self.caller['roles'] and \
-           role_id <= min(self.caller['role_ids']):
-            raise PLCInvalidArgument, "Not allowed to grant that role"
-
-        if role_id not in person['role_ids']:
-            person.add_role(role_id)
-
-        return 1
+        return AddRoleToPerson.call(self, auth, role_id_or_name, person_id_or_email)