This commit was manufactured by cvs2svn to create branch

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

diff --git a/PLC/Methods/DeleteKey.py b/PLC/Methods/DeleteKey.py
index 1242869..313c2a4 100644 (file)
--- a/PLC/Methods/DeleteKey.py
+++ b/PLC/Methods/DeleteKey.py
@@ -2,11 +2,11 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Keys import Key, Keys
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeleteKey(Method):
     """
-    Deletes a Key.
+    Deletes a key.
 
     Non-admins may only delete their own keys.
 
@@ -16,23 +16,31 @@ class DeleteKey(Method):
     roles = ['admin', 'pi', 'tech', 'user']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Key.fields['key_id'],
         ]
 
     returns = Parameter(int, '1 if successful')
 
+
     def call(self, auth, key_id):
-        # Get associated address details
-        keys = Keys(self.api, [key_id]).values()
+        # Get associated key details
+        keys = Keys(self.api, [key_id])
         if not keys:
             raise PLCInvalidArgument, "No such key"
         key = keys[0]
 
+        if key['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local key"
+
         if 'admin' not in self.caller['roles']:
             if key['key_id'] not in self.caller['key_ids']:
-                raise PLCPermissionDenied, "Key must be associated with one your account"
+                raise PLCPermissionDenied, "Key must be associated with your account"
 
         key.delete()
+       
+       # Logging variables
+       self.object_ids = [key['key_id']]
+       self.message = 'Key %d deleted' % key['key_id']
 
         return 1