Merge from HEAD. Signed off by tmack.

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

diff --git a/PLC/Methods/AdmDeletePersonKeys.py b/PLC/Methods/AdmDeletePersonKeys.py
index 7a72e6c..fd24eef 100644 (file)
--- a/PLC/Methods/AdmDeletePersonKeys.py
+++ b/PLC/Methods/AdmDeletePersonKeys.py
@@ -3,7 +3,7 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Persons import Person, Persons
 from PLC.Keys import Key, Keys
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class AdmDeletePersonKeys(Method):
     """
@@ -21,7 +21,7 @@ class AdmDeletePersonKeys(Method):
     roles = ['admin', 'pi', 'tech', 'user']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
         [Key.fields['key_id']]
@@ -34,8 +34,10 @@ class AdmDeletePersonKeys(Method):
         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"
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] != person['person_id']:
@@ -46,7 +48,7 @@ class AdmDeletePersonKeys(Method):
             return 1
 
         # Get associated key details
-        keys = Keys(self.api, key_ids).values()
+        keys = Keys(self.api, key_ids)
 
         for key in keys:
             key.delete()