- send account registration e-mails from the website

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

diff --git a/PLC/Methods/AdmDeleteAllPersonKeys.py b/PLC/Methods/AdmDeleteAllPersonKeys.py
index 374bbb9..9f038f9 100644 (file)
--- a/PLC/Methods/AdmDeleteAllPersonKeys.py
+++ b/PLC/Methods/AdmDeleteAllPersonKeys.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.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 AdmDeleteAllPersonKeys(Method):
     """
 
 class AdmDeleteAllPersonKeys(Method):
     """


@@ -23,7 +23,7 @@ class AdmDeleteAllPersonKeys(Method):
     roles = ['admin', 'pi', 'tech', 'user']
 
     accepts = [
     roles = ['admin', 'pi', 'tech', 'user']
 
     accepts = [

-        PasswordAuth(),
+        Auth(),

         Mixed(Person.fields['person_id'],
               Person.fields['email'])
         ]
         Mixed(Person.fields['person_id'],
               Person.fields['email'])
         ]


@@ -36,7 +36,7 @@ class AdmDeleteAllPersonKeys(Method):
         if not persons:
             raise PLCInvalidArgument, "No such account"
 
         if not persons:
             raise PLCInvalidArgument, "No such account"
 

-        person = persons.values()[0]
+        person = persons[0]

 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] != person['person_id']:
 
         if 'admin' not in self.caller['roles']:
             if self.caller['person_id'] != person['person_id']:


@@ -47,7 +47,7 @@ class AdmDeleteAllPersonKeys(Method):
             return 1
 
         # Get associated key details
             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()
 
         for key in keys:
             key.delete()