Merge branch '15652-crunch-run-memory-use'

[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 a7e8ff2fc8d7024b23b309c5b3e2de67abf5741f..f18c0edda00c5101557f0a275b6f2c99648b2b2a 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
 
@@ -35,7 +40,7 @@ module OmniAuth
         options.client_options[:site] = options[:custom_provider_url]
         options.client_options[:authorize_url] = "#{options[:custom_provider_url]}/auth/josh_id/authorize"
         options.client_options[:access_token_url] = "#{options[:custom_provider_url]}/auth/josh_id/access_token"
-        if Rails.configuration.sso_insecure
+        if Rails.configuration.TLS.Insecure
           options.client_options[:ssl] = {verify_mode: OpenSSL::SSL::VERIFY_NONE}
         end
         ::OAuth2::Client.new(options.client_id, options.client_secret, deep_symbolize(options.client_options))