alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-03-18 15:42:39 +08:00
parent 0d8d6b24c3 fb8c8d4526
commit ab4eefce87
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/initializers/omniauth.rb
View File

@ -1,15 +1,16 @@
OmniAuth.config.logger = Rails.logger OmniAuth.config.logger = Rails.logger
site = Site.first rescue nil
if !site.nil?
client_id = site.google_client_id
client_secret = site.google_client_secret
site = Site.first if !client_id.nil? && !client_secret.nil?
client_id = site.google_client_id Rails.application.config.middleware.use OmniAuth::Builder do
client_secret = site.google_client_secret provider :google_oauth2, client_id, client_secret,{ access_type: "offline", approval_prompt: "" }
end
if !client_id.nil? && !client_secret.nil? else
Rails.application.config.middleware.use OmniAuth::Builder do site.google_oauth_enabled = false
provider :google_oauth2, client_id, client_secret,{ access_type: "offline", approval_prompt: "" } site.save
end end
else
site.google_oauth_enabled = false
site.save
end end