SPIKE: Fix auto re-login bug. (thanks Daniel G)

hjwp · Aug 22, 2015 · b56ff81 · b56ff81
1 parent 90bc62e
commit b56ff81
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/accounts/static/accounts.js b/accounts/static/accounts.js
@@ -4,6 +4,9 @@ var initialize = function (navigator, user, token, urls) {
     $('#id_login').on('click', function () {
         navigator.id.request();
     });
+    $('#id_logout').on('click', function () {
+        navigator.id.logout();
+    });
 
     navigator.id.watch({
         loggedInUser: user,
@@ -15,7 +18,15 @@ var initialize = function (navigator, user, token, urls) {
                 .done(function () { window.location.reload(); })
                 .fail(function () { navigator.id.logout(); });
         },
-        onlogout: function () {}
+        onlogout: function () {
+            $.post(
+                urls.logout,
+                { csrfmiddlewaretoken: token }
+            )
+                .done(function () { window.location.reload(); })
+                .fail(function () { navigator.id.logout(); });
+
+        }
     });
 };
 

diff --git a/lists/templates/base.html b/lists/templates/base.html
@@ -16,7 +16,7 @@
     <nav class="navbar navbar-default" role="navigation">
         <a class="navbar-brand" href="/">Superlists</a>
         {% if user.email %}
-            <a class="btn navbar-btn navbar-right" id="id_logout" href="{% url 'logout' %}">Log out</a>
+            <a class="btn navbar-btn navbar-right" id="id_logout" href="#">Log out</a>
             <span class="navbar-text navbar-right">Logged in as {{ user.email }}</span>
         {% else %}
             <a class="btn navbar-btn navbar-right" id="id_login" href="#">Sign in</a>
@@ -59,7 +59,7 @@ <h1>{% block header_text %}{% endblock %}</h1>
         var token = "{{ csrf_token }}";
         var urls = {
             login: "{% url 'persona_login' %}",
-            logout: "TODO",
+            logout: "{% url 'logout' %}",
         };
         Superlists.Accounts.initialize(navigator, user, token, urls);
     });