Fix KeyTypes, Keys

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

diff --git a/PLC/Methods/AddPersonKey.py b/PLC/Methods/AddPersonKey.py
index edad2cb..2c3fb9d 100644 (file)
--- a/PLC/Methods/AddPersonKey.py
+++ b/PLC/Methods/AddPersonKey.py
@@ -3,7 +3,9 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Keys import Key, Keys
 from PLC.Persons import Person, Persons
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
+
+can_update = lambda (field, value): field in ['key_type', 'key', 'key_id']
 
 class AddPersonKey(Method):
     """
@@ -16,38 +18,37 @@ class AddPersonKey(Method):
 
     roles = ['admin', 'pi', 'tech', 'user']
 
+    key_fields = dict(filter(can_update, Key.fields.items()))
+
     accepts = [
-        PasswordAuth(),
+        Auth(),
         Mixed(Person.fields['person_id'],
               Person.fields['email']),
-        Key.fields['key_type'],
-        Key.fields['key']
+        key_fields
         ]
 
-    returns = Parameter(int, 'New key_id (> 0) if successful')
+    returns = Parameter(str, 'The key_id')
 
-    event_type = 'Add'
-    object_type = 'Key'
-    object_ids = []
+    def call(self, auth, person_id_or_email, key_fields):
+        key_fields = dict(filter(can_update, key_fields.items()))
 
-    def call(self, auth, person_id_or_email, key_type, key_value):
         # Get account details
-        persons = Persons(self.api, [person_id_or_email]).values()
+        persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
         person = persons[0]
 
-       # If we are not admin, make sure caller is adding a key to their account
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
+
+        # If we are not admin, make sure caller is adding a key to their account
         if 'admin' not in self.caller['roles']:
             if person['person_id'] != self.caller['person_id']:
                 raise PLCPermissionDenied, "You may only modify your own keys"
 
-        key = Key(self.api)
-        key['person_id'] = person['person_id']
-        key['key_type'] = key_type
-        key['key'] = key_value
-        key.sync(commit = False)
-        person.add_key(key, commit = True)
-        self.object_ids = [key['key_id']]
+        key_fields['person_id'] = person['person_id']
+        key = Key(self.api, key_fields)
+        key.sync()
+        #person.add_key(key, commit = True)
 
         return key['key_id']