summaryrefslogtreecommitdiff
path: root/app/controllers/api/keys_controller.rb
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2018-01-31 12:27:55 +0100
committerAzul <azul@riseup.net>2018-01-31 13:32:50 +0100
commita55cc3653de22d868ade5303918280a38e8e9fe8 (patch)
treea2c697fa5e5787f4f8905c74554c737cfd76445e /app/controllers/api/keys_controller.rb
parent0a83272f33b0731ea61e47aec9019a3afeb3e975 (diff)
keys: store type and rev in hash rather than serialized
Since the old keys used to be strings i started out by json serializing the new keys with type, value, rev. However storing serialized json in couch (json) does not really make sense. So now we do not serialize but instead have one json document. The lookup for a key of type pgp may still return a string but for everything that uses the new api it will return a hash with type and revision. This data structure is way easier to handle also on the nickserver side.
Diffstat (limited to 'app/controllers/api/keys_controller.rb')
-rw-r--r--app/controllers/api/keys_controller.rb7
1 files changed, 2 insertions, 5 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