From 23d812a4ab0506d4b588b13abf82ebe192a47fac Mon Sep 17 00:00:00 2001
From: Dan Callahan <dan.callahan@gmail.com>
Date: Fri, 1 Mar 2013 13:22:54 -0600
Subject: [PATCH] Use AJAX for submitting Persona credentials.

Fixes issue with needing to unblock popups.
---
 .../users/omniauth_callbacks_controller.rb        |  5 +++++
 app/views/common/_persona_javascript.html.erb     | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 50350b36a..9a57c58eb 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -24,6 +24,11 @@ class Users::OmniauthCallbacksController < ApplicationController
     when "persona"
       create_or_sign_on_user_using_persona(auth_token)
     end
+
+    respond_to do |format|
+      format.html
+      format.json { render :json => @data }
+    end
   end
 
   def failure
diff --git a/app/views/common/_persona_javascript.html.erb b/app/views/common/_persona_javascript.html.erb
index f6448e28a..48d654f7a 100644
--- a/app/views/common/_persona_javascript.html.erb
+++ b/app/views/common/_persona_javascript.html.erb
@@ -1,15 +1,20 @@
 <script src="https://login.persona.org/include.js"></script>
-<form id="persona_assertion_form" action="/auth/persona/callback" method="post" target="_blank">
-  <input type='hidden' name='assertion'/>
-</form>
 <script>
   (function() {
     var readyCalled = false;
     navigator.id.watch({
       onlogin: function(assertion) {
         if (readyCalled) {
-          $('#persona_assertion_form input[name=assertion]').val(assertion);
-          $('#persona_assertion_form').submit();
+
+          $.ajax({
+            type: 'POST',
+            url: '/auth/persona/callback',
+            data: { 'assertion': assertion },
+            success: function(data, textStatus, jqXHR) {
+              Discourse.authenticationComplete(data);
+            },
+            dataType: 'json'
+          });
         }
       },
       onlogout: function() {