From e8f6202d16f4ca74c854c85b375a841869befe77 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 17 Oct 2014 13:51:05 -0300 Subject: [PATCH] oauth_client: fix oauth login flow --- plugins/oauth_client/lib/oauth_client_plugin.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb index c2a1d11..abe7114 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin.rb @@ -56,7 +56,8 @@ class OauthClientPlugin < Noosfero::Plugin domain = Domain.find_by_name(request.host) environment = domain.environment rescue Environment.default - provider_id = request.session['omniauth.params'] ? request.session['omniauth.params']['id'] : request.params['id'] + provider_id = request.params['id'] + provider_id ||= request.session['omniauth.params']['id'] if request.session['omniauth.params'] provider = environment.oauth_providers.find(provider_id) strategy.options.merge!(provider.options.symbolize_keys) -- libgit2 0.21.2