Merge branch 'master' into 4523-full-text-search

[arvados.git] / services / api / lib / josh_id.rb

diff --git a/services/api/lib/josh_id.rb b/services/api/lib/josh_id.rb
index c0efb512b469f1431c8937d681c9c374a692f5b1..a7e8ff2fc8d7024b23b309c5b3e2de67abf5741f 100644 (file)
--- a/services/api/lib/josh_id.rb
+++ b/services/api/lib/josh_id.rb
@@ -27,7 +27,7 @@ module OmniAuth
       end
 
       def authorize_params
-        options.authorize_params[:auth_method] = request.params['auth_method']
+        options.authorize_params[:auth_provider] = request.params['auth_provider']
         super
       end
 
@@ -42,7 +42,7 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + script_name + callback_path + "?return_to=" + CGI.escape(request.params['return_to'])
+        full_host + script_name + callback_path + "?return_to=" + CGI.escape(request.params['return_to'] || '')
       end
 
       def raw_info