From e37d7bc4f0d620b6f27cc4ed784d3fe47f522ab0 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Sat, 30 May 2015 20:30:39 -0300 Subject: [PATCH] oauth_client: fix popup check --- plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62782f0..46c72f5 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 @@ -19,7 +19,7 @@ class OauthClientPluginPublicController < PublicController end def finish - if session.delete(:oauth_client_popup) + if session.delete(:oauth_client_popup) || request.env.fetch('omniauth.params', {})['oauth_client_popup'] current_user.private_token_expired? if current_user.present? private_token = current_user.present? ? current_user.private_token : '' render 'oauth_client_plugin_public/finish', :locals => {:private_token => private_token, :user => params[:user]}, :layout => false -- libgit2 0.21.2