Download as
Browse Code »

Commit fa2ddf483de787bbcfc57cc42a7be41c23d191de

Authored by Victor Costa
1 parent 80b76bb0
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

oauth_client: accept proxy configuration from ENV

Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
  Diff comments   View file @fa2ddf4
@@ -17,6 +17,7 @@ class OauthClientPluginPublicController < PublicController @@ -17,6 +17,7 @@ class OauthClientPluginPublicController < PublicController
17 end 17 end
18 18
19 def failure 19 def failure
  20 + session[:notice] = _('Failed to login')
20 redirect_to root_url 21 redirect_to root_url
21 end 22 end
22 23
plugins/oauth_client/lib/oauth_client_plugin.rb
  Diff comments   View file @fa2ddf4
@@ -55,7 +55,7 @@ class OauthClientPlugin < Noosfero::Plugin @@ -55,7 +55,7 @@ class OauthClientPlugin < Noosfero::Plugin
55 55
56 Rails.application.config.middleware.use OmniAuth::Builder do 56 Rails.application.config.middleware.use OmniAuth::Builder do
57 PROVIDERS.each do |provider, options| 57 PROVIDERS.each do |provider, options|
58 - provider provider, :setup => lambda { |env| 58 + setup = lambda { |env|
59 request = Rack::Request.new env 59 request = Rack::Request.new env
60 strategy = env['omniauth.strategy'] 60 strategy = env['omniauth.strategy']
61 61
@@ -66,7 +66,12 @@ class OauthClientPlugin < Noosfero::Plugin @@ -66,7 +66,12 @@ class OauthClientPlugin < Noosfero::Plugin
66 66
67 strategy.options.client_id = providers[provider][:client_id] 67 strategy.options.client_id = providers[provider][:client_id]
68 strategy.options.client_secret = providers[provider][:client_secret] 68 strategy.options.client_secret = providers[provider][:client_secret]
69 - }, :path_prefix => '/plugin/oauth_client', :callback_path => "/plugin/oauth_client/public/callback/#{provider}" 69 + }
  70 +
  71 + provider provider, :setup => setup,
  72 + :path_prefix => '/plugin/oauth_client',
  73 + :callback_path => "/plugin/oauth_client/public/callback/#{provider}",
  74 + :client_options => { :connection_opts => { :proxy => ENV["HTTP_PROXY"] || ENV["http_proxy"] || ENV["HTTPS_PROXY"] || ENV["https_proxy"] } }
70 end 75 end
71 76
72 unless Rails.env.production? 77 unless Rails.env.production?