From fa2ddf483de787bbcfc57cc42a7be41c23d191de Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 9 Oct 2014 17:05:05 -0300 Subject: [PATCH] oauth_client: accept proxy configuration from ENV --- plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb | 1 + plugins/oauth_client/lib/oauth_client_plugin.rb | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb b/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb index 834bec2..365b078 100644 --- a/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb +++ b/plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb @@ -17,6 +17,7 @@ class OauthClientPluginPublicController < PublicController end def failure + session[:notice] = _('Failed to login') redirect_to root_url end diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb index 056c66a..da10820 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin.rb @@ -55,7 +55,7 @@ class OauthClientPlugin < Noosfero::Plugin Rails.application.config.middleware.use OmniAuth::Builder do PROVIDERS.each do |provider, options| - provider provider, :setup => lambda { |env| + setup = lambda { |env| request = Rack::Request.new env strategy = env['omniauth.strategy'] @@ -66,7 +66,12 @@ class OauthClientPlugin < Noosfero::Plugin strategy.options.client_id = providers[provider][:client_id] strategy.options.client_secret = providers[provider][:client_secret] - }, :path_prefix => '/plugin/oauth_client', :callback_path => "/plugin/oauth_client/public/callback/#{provider}" + } + + provider provider, :setup => setup, + :path_prefix => '/plugin/oauth_client', + :callback_path => "/plugin/oauth_client/public/callback/#{provider}", + :client_options => { :connection_opts => { :proxy => ENV["HTTP_PROXY"] || ENV["http_proxy"] || ENV["HTTPS_PROXY"] || ENV["https_proxy"] } } end unless Rails.env.production? -- libgit2 0.21.2