From 71f35c4c5039126f06e8a6ee671b6fe7b6bd6271 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Thu, 19 Mar 2020 11:18:30 -0400 Subject: [PATCH] Add callback location for each provider (#1029) Co-authored-by: Jesus Federico --- config/initializers/omniauth.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 0edb9b67..f10eb98b 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -42,18 +42,22 @@ Rails.application.config.middleware.use OmniAuth::Builder do if Rails.configuration.omniauth_google Rails.application.config.providers << :google + redirect = ENV['OAUTH2_REDIRECT'].present? ? File.join(ENV['OAUTH2_REDIRECT'], "auth", "google", "callback") : nil + provider :google_oauth2, ENV['GOOGLE_OAUTH2_ID'], ENV['GOOGLE_OAUTH2_SECRET'], scope: %w(profile email), access_type: 'online', name: 'google', - redirect_uri: ENV['OAUTH2_REDIRECT'].presence || nil, + redirect_uri: redirect, setup: SETUP_PROC end if Rails.configuration.omniauth_office365 Rails.application.config.providers << :office365 + redirect = ENV['OAUTH2_REDIRECT'].present? ? File.join(ENV['OAUTH2_REDIRECT'], "auth", "office365", "callback") : nil + provider :office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET'], - redirect_uri: ENV['OAUTH2_REDIRECT'].presence || nil, + redirect_uri: redirect, setup: SETUP_PROC end end