Merge branch 'feature/different-keytypes' into 'master'

couch: add identity view to get all keys

See merge request leap/webapp!61

2 files changed, 3 insertions, 6 deletions

diff --git a/app/controllers/api/keys_controller.rb b/app/controllers/api/keys_controller.rb
index 7eb76ee..32ccc19 100644
--- a/app/controllers/api/keys_controller.rb
+++ b/app/controllers/api/keys_controller.rb
@@ -5,14 +5,11 @@ class Api::KeysController < ApiController
 
   # get /keys
   def index
-    keys = identity.keys.map do |k,v|
-      [k, JSON.parse(v)]
-    end
-    render json: keys.to_h
+    render json: identity.keys
   end
 
   def show
-    render json: JSON.parse(identity.keys[params[:id]])
+    render json: identity.keys[params[:id]]
   end
 
   def create
diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index 65b80c7..eda37e8 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -112,7 +112,7 @@ module Api
       PgpKey.new(key).tap do |key|
         if key.valid?
           identity = Identity.for(@user)
-          identity.set_key(:pgp, key)
+          identity.set_key(:pgp, key.to_s)
           identity.save
         end
       end