Merge branch '13939-unqualified-contents-orders'

[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..bb6c1f48a80b121a2a7fee7e88a619400c93c07a 100644 (file)
--- a/services/api/lib/josh_id.rb
+++ b/services/api/lib/josh_id.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
@@ -17,6 +21,7 @@ module OmniAuth
           :last_name => raw_info['info']['last_name'],
           :email => raw_info['info']['email'],
           :identity_url => raw_info['info']['identity_url'],
+          :username => raw_info['info']['username'],
         }
       end
 
@@ -27,7 +32,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 +47,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