- pull bulk of functionality into get_slivers() utility function so that

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

diff --git a/PLC/Methods/DeletePerson.py b/PLC/Methods/DeletePerson.py
index 8375439..dcb2e52 100644 (file)
--- a/PLC/Methods/DeletePerson.py
+++ b/PLC/Methods/DeletePerson.py
@@ -2,7 +2,7 @@ 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.Auth import Auth
 
 class DeletePerson(Method):
     """
@@ -18,20 +18,25 @@ class DeletePerson(Method):
     roles = ['admin', 'pi', 'user', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email'])
         ]
 
     returns = Parameter(int, '1 if successful')
 
+    object_type = 'Person'
+
+
     def call(self, auth, person_id_or_email):
         # Get account information
         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"
 
         # Authenticated function
         assert self.caller is not None
@@ -41,5 +46,9 @@ class DeletePerson(Method):
             raise PLCPermissionDenied, "Not allowed to delete specified account"
 
         person.delete()
+       
+       # Logging variables
+       self.object_ids = [person['person_id']]
+       self.message = 'Person %d deleted' % person['person_id']
 
         return 1