lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #318 Allow multiple domains when using Google as OAuth provider (GRN-38) (#319)

Browse Source 
* <Added muli_domain restriction with google_oauth>

* <Fixed code style>

* <Added some rspec tests>
This commit is contained in:
John Ma
2018-11-15 15:01:53 -05:00
committed by Jesus Federico
parent 1954ba4cff
commit efa9e08dfc
4 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/initializers/omniauth.rb
View File

@ -17,7 +17,12 @@ Rails.application.config.omniauth_bn_launcher = Rails.configuration.loadbalanced
Rails.application.config.allow_user_signup = false if Rails.application.config.omniauth_ldap
SETUP_PROC = lambda do |env|
SessionsController.helpers.omniauth_options env
provider = env['omniauth.strategy'].options[:name]
if provider == "google"
SessionsController.helpers.google_omniauth_hd env, ENV['GOOGLE_OAUTH2_HD']
else
SessionsController.helpers.omniauth_options env
end
end
# Setup the Omniauth middleware.
@ -35,7 +40,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
scope: %w(profile email),
access_type: 'online',
name: 'google',
hd: ENV['GOOGLE_OAUTH2_HD'].blank? ? nil : ENV['GOOGLE_OAUTH2_HD']
setup: SETUP_PROC
provider :microsoft_office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET']