X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f03578e82ee77ded83387b27b275fa442933203b..1e4630ddb8015d72978aae1be334cce2f8ca20d4:/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 35a318b94f..a1b2356bd5 100644 --- a/services/api/config/initializers/omniauth_init.rb +++ b/services/api/config/initializers/omniauth_init.rb @@ -9,14 +9,14 @@ if defined? CUSTOM_PROVIDER_URL Rails.logger.warn "Copying omniauth from globals in legacy config file." - Rails.configuration.Login["ProviderAppID"] = APP_ID - Rails.configuration.Login["ProviderAppSecret"] = APP_SECRET + Rails.configuration.Login["SSO"]["ProviderAppID"] = APP_ID + Rails.configuration.Login["SSO"]["ProviderAppSecret"] = APP_SECRET Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL.sub(/\/$/, "") + "/" else Rails.application.config.middleware.use OmniAuth::Builder do provider(:josh_id, - Rails.configuration.Login["ProviderAppID"], - Rails.configuration.Login["ProviderAppSecret"], + Rails.configuration.Login["SSO"]["ProviderAppID"], + Rails.configuration.Login["SSO"]["ProviderAppSecret"], Rails.configuration.Services["SSO"]["ExternalURL"]) end OmniAuth.config.on_failure = StaticController.action(:login_failure)