redirect back to base uri if there is no window opener.

2015-10-13 12:03:43 +11:00 · 2015-10-13 12:03:43 +11:00 · 57e3323663
parent 25db4cc4d9
commit 57e3323663
1 changed files with 6 additions and 2 deletions
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@ -22,8 +22,12 @@
    <p><%=t "login.close_window" %></p>

    <script type="text/javascript">
-      window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
-      window.close();
+      if(window.opener) {
+        window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
+        window.close();
+      } else {
+        window.location = '<%= Discourse.base_uri("/") %>';
+      }
    </script>
  </div>
 </body>