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

Merge pull request #186 from joshua-arts/master

Browse Source 
Fix Google authentication and update Omniauth to 1.6.1.
This commit is contained in:
Joshua Arts
2017-08-22 15:40:35 -04:00
committed by GitHub
parent 83c3a63583 be136fe255
commit c5c4afe493
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -62,7 +62,7 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'omniauth', '1.3.1' gem 'omniauth', '1.6.1'
gem 'omniauth-twitter', '1.2.1' gem 'omniauth-twitter', '1.2.1'
gem 'omniauth-google-oauth2', '0.4.1' gem 'omniauth-google-oauth2', '0.4.1'
gem 'omniauth-ldap' gem 'omniauth-ldap'

10
Gemfile.lock
View File

@@ -139,9 +139,9 @@ GEM
multi_json (~> 1.3) multi_json (~> 1.3)
multi_xml (~> 0.5) multi_xml (~> 0.5)
rack (>= 1.2, < 3) rack (>= 1.2, < 3)
omniauth (1.3.1) omniauth (1.6.1)
hashie (>= 1.2, < 4) hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.0, < 3) rack (>= 1.6.2, < 3)
omniauth-google-oauth2 (0.4.1) omniauth-google-oauth2 (0.4.1)
jwt (~> 1.5.2) jwt (~> 1.5.2)
multi_json (~> 1.3) multi_json (~> 1.3)
@@ -292,7 +292,7 @@ DEPENDENCIES
listen (~> 3.0.5) listen (~> 3.0.5)
lograge lograge
mocha mocha
omniauth (= 1.3.1) omniauth (= 1.6.1)
omniauth-google-oauth2 (= 0.4.1) omniauth-google-oauth2 (= 0.4.1)
omniauth-ldap omniauth-ldap
omniauth-twitter (= 1.2.1) omniauth-twitter (= 1.2.1)
@@ -317,4 +317,4 @@ RUBY VERSION
ruby 2.4.0p0 ruby 2.4.0p0
BUNDLED WITH BUNDLED WITH
1.15.3 1.15.4

2
config/initializers/omniauth.rb
View File

@@ -12,7 +12,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
scope: ENV['ENABLE_YOUTUBE_UPLOADING'] && ENV['ENABLE_YOUTUBE_UPLOADING'] == "true" ? ['profile', 'email', 'youtube', 'youtube.upload'] : ['profile', 'email'] , scope: ENV['ENABLE_YOUTUBE_UPLOADING'] && ENV['ENABLE_YOUTUBE_UPLOADING'] == "true" ? ['profile', 'email', 'youtube', 'youtube.upload'] : ['profile', 'email'] ,
access_type: 'online', access_type: 'online',
name: 'google', name: 'google',
hd: ENV['GOOGLE_OAUTH2_HD'] hd: ENV['GOOGLE_OAUTH2_HD'].blank? ? nil : ENV['GOOGLE_OAUTH2_HD']
provider :ldap, provider :ldap,
host: ENV['LDAP_SERVER'], host: ENV['LDAP_SERVER'],
port: ENV['LDAP_PORT'] || '389', port: ENV['LDAP_PORT'] || '389',