Merge pull request #3008 from gratipay/fix-js-sign-out

Fix JS sign-out
gratipay · Dec 14, 2014 · 54a82b5 · 54a82b5
2 parents 94d83ad + 68af1a9
commit 54a82b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/tests/py/test_pages.py b/tests/py/test_pages.py
@@ -96,6 +96,12 @@ def test_sign_out_overwrites_session_cookie(self):
         assert response.code == 302
         assert response.headers.cookie[SESSION].value == ''
 
+    def test_sign_out_doesnt_redirect_xhr(self):
+        self.make_participant('alice')
+        response = self.client.PxST('/sign-out.html', auth_as='alice',
+                                    HTTP_X_REQUESTED_WITH=b'XMLHttpRequest')
+        assert response.code == 200
+
     def test_receipts_signed_in(self):
         self.make_participant('alice', claimed_time='now')
         self.db.run("INSERT INTO exchanges (id, participant, amount, fee) "

diff --git a/www/sign-out.html.spt b/www/sign-out.html.spt
@@ -8,6 +8,9 @@ if user.ANON:
 if POST:
     user.sign_out(response.headers.cookie)
 
+    if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
+        raise Response(200)
+
     if 'back_to' in request.body:
         back_to = request.body['back_to']
     else: