From 3a2198d1fae0da5846d87ab15b17b4733548d7ea Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Mon, 27 Jan 2020 22:58:19 -0800 Subject: [PATCH] Cleanup config file, ensure providers are set if present --- config/initializers/devise.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 92d933ff..101f0c3d 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -8,7 +8,9 @@ Devise.setup do |config| # config.omniauth :open_id, name: 'suse', identifier: 'http://www.opensuse.org/openid/user' - config.omniauth :google_oauth2, (ENV['OSEM_GOOGLE_KEY'] || Rails.application.secrets.google_key), (ENV['OSEM_GOOGLE_SECRET'] || Rails.application.secrets.google_secret), + config.omniauth :google_oauth2, + (ENV['OSEM_GOOGLE_KEY'] || Rails.application.secrets.google_key), + (ENV['OSEM_GOOGLE_SECRET'] || Rails.application.secrets.google_secret), name: 'google', scope: 'email' @@ -16,8 +18,13 @@ Devise.setup do |config| sso_url: 'https://forum.snap.berkeley.edu/session/sso_provider', sso_secret: ENV['OSEM_DISCOURSE_SECRET'] - # config.omniauth :facebook, (ENV['OSEM_FACEBOOK_KEY'] || Rails.application.secrets.facebook_key), (ENV['OSEM_FACEBOOK_SECRET'] || Rails.application.secrets.facebook_secret) - # config.omniauth :github, (ENV['OSEM_GITHUB_KEY'] || Rails.application.secrets.github_key), (ENV['OSEM_GITHUB_SECRET'] || Rails.application.secrets.github_secret) + config.omniauth :facebook, + (ENV['OSEM_FACEBOOK_KEY'] || Rails.application.secrets.facebook_key), + (ENV['OSEM_FACEBOOK_SECRET'] || Rails.application.secrets.facebook_secret) + + config.omniauth :github, + (ENV['OSEM_GITHUB_KEY'] || Rails.application.secrets.github_key), + (ENV['OSEM_GITHUB_SECRET'] || Rails.application.secrets.github_secret) # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer,