From 8da9557f66bcbaa91f540d44f7175a9e2436fa9b Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Tue, 3 Nov 2015 14:00:14 +0100
Subject: Redirect to / if ajax request returns 401 status

- see issue pixelated/project-issues#162
- move test code to monitored_ajax_call.spec.js
---
 web-ui/app/js/helpers/monitored_ajax.js            |  2 ++
 .../test/spec/helpers/monitored_ajax_call.spec.js  | 38 ++++++++++++++++++++++
 web-ui/test/spec/services/mail_service.spec.js     | 18 ----------
 3 files changed, 40 insertions(+), 18 deletions(-)

(limited to 'web-ui')

diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js
index d05fdc4c..1cb720de 100644
--- a/web-ui/app/js/helpers/monitored_ajax.js
+++ b/web-ui/app/js/helpers/monitored_ajax.js
@@ -54,6 +54,8 @@ define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n,
       if (xmlhttprequest.status === 302) {
         var redirectUrl = xmlhttprequest.getResponseHeader('Location');
         browser.redirect(redirectUrl);
+      }else if (xmlhttprequest.status === 401) {
+        browser.redirect('/');
       }
 
     }.bind(this));
diff --git a/web-ui/test/spec/helpers/monitored_ajax_call.spec.js b/web-ui/test/spec/helpers/monitored_ajax_call.spec.js
index bf7a2db4..972ca3ae 100644
--- a/web-ui/test/spec/helpers/monitored_ajax_call.spec.js
+++ b/web-ui/test/spec/helpers/monitored_ajax_call.spec.js
@@ -35,6 +35,44 @@ define(['helpers/monitored_ajax'], function (monitoredAjax) {
         expect(component.trigger).toHaveBeenCalledWith(document, Pixelated.events.ui.userAlerts.displayMessage,
             { message: 'Server Message' });
       });
+    });
+
+    describe('when user seems to be logged out', function () {
+      var component, browser;
+
+      beforeEach(function () {
+        component = { trigger: function () {}};
+        browser = require('helpers/browser');
+
+      });
+
+      it('will redirect the browser to the location specified', function () {
+        var redirectUrl = '/some/redirect/url';
+        var deferred = $.Deferred();
+        spyOn($, 'ajax').and.returnValue(deferred);
+        var spyRedirect = spyOn(browser, 'redirect').and.returnValue($.Deferred());
+
+        monitoredAjax(component, '/some/url', {});
+
+        deferred.reject({status: 302, getResponseHeader: function (_) {return redirectUrl;}}, '', '');
+
+        expect(spyRedirect).toHaveBeenCalled();
+        expect(spyRedirect.calls.mostRecent().args[0]).toEqual(redirectUrl);
+      });
+
+      it ('will redirect the browser to root if authentication is required', function () {
+        var redirectUrl = '/';
+        var deferred = $.Deferred();
+        spyOn($, 'ajax').and.returnValue(deferred);
+        var spyRedirect = spyOn(browser, 'redirect').and.returnValue($.Deferred());
+
+        monitoredAjax(component, '/some/url', {});
+
+        deferred.reject({status: 401}, '', '');
+
+        expect(spyRedirect).toHaveBeenCalled();
+        expect(spyRedirect.calls.mostRecent().args[0]).toEqual(redirectUrl);
+      });
 
     });
   });
diff --git a/web-ui/test/spec/services/mail_service.spec.js b/web-ui/test/spec/services/mail_service.spec.js
index 2cf69a9d..7fb2bfda 100644
--- a/web-ui/test/spec/services/mail_service.spec.js
+++ b/web-ui/test/spec/services/mail_service.spec.js
@@ -130,24 +130,6 @@ describeComponent('services/mail_service', function () {
     expect(spyAjax.calls.mostRecent().args[1].type).toEqual('DELETE');
   });
 
-  describe('when request fails', function () {
-    it ('will redirect the browser to the location specified', function () {
-      var browser = require('helpers/browser');
-      var redirectUrl = '/some/redirect/url';
-      var me = {};
-      var deferred = $.Deferred();
-      spyOn($, 'ajax').and.returnValue(deferred);
-      var spyRedirect = spyOn(browser, 'redirect').and.returnValue($.Deferred());
-
-      this.component.trigger(Pixelated.events.mail.want, { caller: me, mail: email1.ident });
-
-      deferred.reject({status: 302, getResponseHeader: function (_) {return redirectUrl;}}, '', '');
-
-      expect(spyRedirect).toHaveBeenCalled();
-      expect(spyRedirect.calls.mostRecent().args[0]).toEqual(redirectUrl);
-    });
-  });
-
   describe('when successfuly deletes an email', function () {
     var displayMessageEvent, uncheckAllEvent, mailsDeletedEvent;
 
-- 
cgit v1.2.3