From a3d5af5f869a60e3e71d3f2e7a2c87a07d669569 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Tue, 14 Apr 2015 14:02:33 -0300
Subject: [PATCH] oauth_client: do not call close popup js when oauth_client wasn't called

---
 plugins/oauth_client/controllers/public/oauth_client_plugin_public_controller.rb | 1 +
 plugins/oauth_client/lib/oauth_client_plugin.rb                                  | 2 +-
 plugins/oauth_client/public/main.js                                              | 4 ++--
 3 files changed, 4 insertions(+), 3 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 af11fc7..8a75ba0 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
@@ -31,6 +31,7 @@ class OauthClientPluginPublicController < PublicController
     else
       session[:notice] = _("Can't login with #{provider.name}")
     end
+    session[:oauth_client_login] = true
 
     redirect_to :controller => :account, :action => :login
   end
diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb
index 78e5770..ec44939 100644
--- a/plugins/oauth_client/lib/oauth_client_plugin.rb
+++ b/plugins/oauth_client/lib/oauth_client_plugin.rb
@@ -30,7 +30,7 @@ class OauthClientPlugin < Noosfero::Plugin
   end
 
   def body_ending
-    "<script>oauthPluginCloseLoginPopup(#{logged_in?});</script>"
+    session.delete(:oauth_client_login) ? "<script>oauthPluginCloseLoginPopup(#{logged_in?}, '#{current_user.private_token}');</script>" : ''
   end
 
   def js_files
diff --git a/plugins/oauth_client/public/main.js b/plugins/oauth_client/public/main.js
index b94e5d9..cc378ce 100644
--- a/plugins/oauth_client/public/main.js
+++ b/plugins/oauth_client/public/main.js
@@ -1,7 +1,7 @@
-function oauthPluginCloseLoginPopup(loggedIn) {
+function oauthPluginCloseLoginPopup(loggedIn, privateToken) {
   if (window.opener && typeof window.opener.handleLoginResult == 'function') {
     try {
-      window.opener.handleLoginResult(loggedIn);
+      window.opener.handleLoginResult(loggedIn, privateToken);
     } catch (err) {}
     window.close();
   }
--
libgit2 0.21.2