From b032c63773a09f82c1b1053d0dd4e29842d243d5 Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Mon, 8 Feb 2016 08:44:12 +1100
Subject: [PATCH] FIX: properly defer authentication complete

---
 app/views/common/_discourse_javascript.html.erb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 81358192468..5f52c531efc 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -33,6 +33,18 @@
 </script>
 
 <script>
+  <%- if !current_user && flash[:authentication_data] %>
+    require('discourse/routes/application').default.reopen({
+      actions: {
+        didTransition: function() {
+          Em.run.next(function(){
+            Discourse.authenticationComplete(<%=flash[:authentication_date].html_safe%>);
+          });
+          return this._super();
+        }
+      }
+    });
+  <%- end %>
   Discourse.CDN = '<%= Rails.configuration.action_controller.asset_host %>';
   Discourse.BaseUrl = '<%= RailsMultisite::ConnectionManagement.current_hostname %>'.replace(/:[\d]*$/,"");
   Discourse.BaseUri = '<%= Discourse::base_uri %>';
@@ -53,11 +65,6 @@
     <%- end %>
     Discourse.S3BaseUrl = '<%= Discourse.store.absolute_base_url %>';
   <%- end %>
-  <%- if !current_user && flash[:authentication_data] %>
-  Em.run.next(function(){
-    Discourse.authenticationComplete(<%=flash[:authentication_data].html_safe%>);
-  });
-  <%- end %>
 </script>
 
 <%= script 'browser-update' %>