Merge branch '1678-new-user-orientation-pete-wfh' of git.clinicalfuture.com:arvados...

[arvados.git] / apps / workbench / app / controllers / authorized_keys_controller.rb

diff --git a/apps/workbench/app/controllers/authorized_keys_controller.rb b/apps/workbench/app/controllers/authorized_keys_controller.rb
index a2beb494e41149b60e1981eaf6b9bbd6aa5ed39e..6bbb01dc316ff931ece288428a3889bf8508e1f5 100644 (file)
--- a/apps/workbench/app/controllers/authorized_keys_controller.rb
+++ b/apps/workbench/app/controllers/authorized_keys_controller.rb
@@ -6,7 +6,8 @@ class AuthorizedKeysController < ApplicationController
   end
 
   def create
-    @object = AuthorizedKey.new authorized_user_uuid: current_user.uuid, key_type: 'SSH'
+    defaults = { authorized_user_uuid: current_user.uuid, key_type: 'SSH' }
+    @object = AuthorizedKey.new defaults.merge(params[:authorized_key] || {})
     super
   end
 end