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.Auth import Auth
+from PLC.Roles import Role, Roles
class DeleteRoleFromPerson(Method):
"""
roles = ['admin', 'pi']
accepts = [
- PasswordAuth(),
+ Auth(),
+ Mixed(Role.fields['role_id'],
+ Role.fields['name']),
Mixed(Person.fields['person_id'],
Person.fields['email']),
- Parameter(int, 'Role ID')
]
returns = Parameter(int, '1 if successful')
- def call(self, auth, person_id_or_email, role_id):
+
+ def call(self, auth, role_id_or_name, person_id_or_email):
# Get all roles
- roles = Roles(self.api)
- if role_id not in roles:
- raise PLCInvalidArgument, "Invalid role ID"
+ roles = {}
+ 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"
+
+ 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]
+ person = persons[0]
+ PLCCheckLocalPerson(person,"DeleteRoleFromPerson")
# Authenticated function
assert self.caller is not None
if role_id in person['role_ids']:
person.remove_role(role_id)
-
+
+ # Logging variables
+ self.object_ids = [person['person_id']]
+ self.message = 'Role %d revoked from person %d' \
+ (role['role_id'], person['person_id'])
return 1