X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b92203411f6f6adaef1c2af62495830f13f4fa14..afcef9cee9922db71e268624ec658f535755aada:/services/api/config/initializers/omniauth_init.rb diff --git a/services/api/config/initializers/omniauth_init.rb b/services/api/config/initializers/omniauth_init.rb index 3277c2bef0..5610999a94 100644 --- a/services/api/config/initializers/omniauth_init.rb +++ b/services/api/config/initializers/omniauth_init.rb @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + # This file is called omniauth_init.rb instead of omniauth.rb because # older versions had site configuration in omniauth.rb. # @@ -5,15 +9,15 @@ if defined? CUSTOM_PROVIDER_URL Rails.logger.warn "Copying omniauth from globals in legacy config file." - Rails.configuration.sso_app_id = APP_ID - Rails.configuration.sso_app_secret = APP_SECRET - Rails.configuration.sso_provider_url = CUSTOM_PROVIDER_URL + Rails.configuration.Login["ProviderAppID"] = APP_ID + Rails.configuration.Login["ProviderAppSecret"] = APP_SECRET + Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL else Rails.application.config.middleware.use OmniAuth::Builder do provider(:josh_id, - Rails.configuration.sso_app_id, - Rails.configuration.sso_app_secret, - Rails.configuration.sso_provider_url) + Rails.configuration.Login["ProviderAppID"], + Rails.configuration.Login["ProviderAppSecret"], + Rails.configuration.Services["SSO"]["ExternalURL"]) end OmniAuth.config.on_failure = StaticController.action(:login_failure) end