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

This commit is contained in:
Harry Bomrah 2015-03-18 15:43:23 +08:00
commit 7d6fdc2559
1 changed files with 11 additions and 10 deletions

View File

@ -1,15 +1,16 @@
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
client_id = site.google_client_id
client_secret = site.google_client_secret
if !client_id.nil? && !client_secret.nil?
Rails.application.config.middleware.use OmniAuth::Builder do
provider :google_oauth2, client_id, client_secret,{ access_type: "offline", approval_prompt: "" }
if !client_id.nil? && !client_secret.nil?
Rails.application.config.middleware.use OmniAuth::Builder do
provider :google_oauth2, client_id, client_secret,{ access_type: "offline", approval_prompt: "" }
end
else
site.google_oauth_enabled = false
site.save
end
else
site.google_oauth_enabled = false
site.save
end