X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/df9e166a5ffc4aa79658bec1a5d552a3b413f0d8..454ee2b8f0385c542b6f1165a3baf2820425e1a3:/services/api/lib/josh_id.rb diff --git a/services/api/lib/josh_id.rb b/services/api/lib/josh_id.rb index a7e8ff2fc8..f18c0edda0 100644 --- 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))