From eff28652782b312c3ae69cf27470bc17575814fa Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 10 Jun 2016 11:12:46 -0400
Subject: [PATCH] FIX: Support create account on facebook browser

---
 .../discourse/initializers/auth-complete.js.es6     | 13 +++++++++++++
 .../users/omniauth_callbacks/complete.html.erb      |  7 +++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/initializers/auth-complete.js.es6

diff --git a/app/assets/javascripts/discourse/initializers/auth-complete.js.es6 b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
new file mode 100644
index 00000000000..613d03fd115
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/auth-complete.js.es6
@@ -0,0 +1,13 @@
+export default {
+  name: "auth-complete",
+  after: "inject-objects",
+  initialize() {
+    if (window.location.search.indexOf('authComplete=true') !== -1) {
+      const lastAuthResult = localStorage.getItem('lastAuthResult');
+      if (lastAuthResult) {
+        Discourse.authenticationComplete(JSON.parse(lastAuthResult));
+      }
+    }
+  }
+};
+
diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb
index 07bd7014636..4d7f5dd9ecb 100644
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@@ -22,12 +22,15 @@
     <p><%=t "login.close_window" %></p>
 
     <script type="text/javascript">
+       var authResult = <%=@auth_result.to_client_hash.to_json.html_safe%>;
+
        // On facebook browser, just redirect and don't close
        var ua = navigator.userAgent || navigator.vendor || window.opera;
        if ((ua.indexOf("FBAN") > -1) || (ua.indexOf("FBAV") > -1)) {
-         window.location.href = '<%= Discourse.base_url.html_safe %>';
+         localStorage.setItem('lastAuthResult', JSON.stringify(authResult));
+         window.location.href = '<%= Discourse.base_url.html_safe %>?authComplete=true';
        } else {
-         window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
+         window.opener.Discourse.authenticationComplete(authResult);
          window.close();
        }
     </script>