oauth_client: fix popup check

Victor Costa
1 parent 7a4a7997
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb
@@ -19,7 +19,7 @@ class OauthClientPluginPublicController &lt; 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
...	...	@@ -19,7 +19,7 @@ class OauthClientPluginPublicController < PublicController
19	19	end
20	20
21	21	def finish
22		- if session.delete(:oauth_client_popup)
	22	+ if session.delete(:oauth_client_popup) \|\| request.env.fetch('omniauth.params', {})['oauth_client_popup']
23	23	current_user.private_token_expired? if current_user.present?
24	24	private_token = current_user.present? ? current_user.private_token : ''
25	25	render 'oauth_client_plugin_public/finish', :locals => {:private_token => private_token, :user => params[:user]}, :layout => false
...	...