From: Tom Clegg <tom@tomclegg.ca>
Date: Thu, 14 May 2020 17:38:04 +0000 (-0400)
Subject: Merge branch '15881-ldap'
X-Git-Tag: 2.1.0~222
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/374cc9ffdd945cec08abbc3ff91b4b2b147cd840

Merge branch '15881-ldap'

refs #15881

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---

374cc9ffdd945cec08abbc3ff91b4b2b147cd840
diff --cc services/api/config/initializers/omniauth_init.rb
index 35a318b94f,5557be1dcd..a1b2356bd5
--- a/services/api/config/initializers/omniauth_init.rb
+++ b/services/api/config/initializers/omniauth_init.rb
@@@ -9,9 -9,9 +9,9 @@@
  
  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
 +  Rails.configuration.Services["SSO"]["ExternalURL"] = CUSTOM_PROVIDER_URL.sub(/\/$/, "") + "/"
  else
    Rails.application.config.middleware.use OmniAuth::Builder do
      provider(:josh_id,