summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2015-10-29 10:18:54 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-10-29 10:20:14 +0100
commitcb405e32d1a66cb047aca44c81203a58cc5c2068 (patch)
tree0e5a00b03672df8d9198a566e23b192b5f07d48b
parenteb3b4bbbd3c5e3c842f9d12622bb25b45b97b38c (diff)
Redirect user to login if ajax request fails with 302
- See project issue 162 - Should solve 'disconnected' problems
-rw-r--r--web-ui/app/js/helpers/browser.js29
-rw-r--r--web-ui/app/js/helpers/monitored_ajax.js12
-rw-r--r--web-ui/test/spec/services/mail_service.spec.js18
3 files changed, 56 insertions, 3 deletions
diff --git a/web-ui/app/js/helpers/browser.js b/web-ui/app/js/helpers/browser.js
new file mode 100644
index 00000000..e5be6667
--- /dev/null
+++ b/web-ui/app/js/helpers/browser.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014 ThoughtWorks, Inc.
+ *
+ * Pixelated is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pixelated is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define([], function () {
+
+ 'use strict';
+
+ function redirect(url) {
+ window.location.replace(url);
+ }
+
+ return {
+ redirect: redirect
+ };
+});
diff --git a/web-ui/app/js/helpers/monitored_ajax.js b/web-ui/app/js/helpers/monitored_ajax.js
index 7f9a9beb..d05fdc4c 100644
--- a/web-ui/app/js/helpers/monitored_ajax.js
+++ b/web-ui/app/js/helpers/monitored_ajax.js
@@ -15,7 +15,7 @@
* along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
*/
-define(['page/events', 'views/i18n'], function (events, i18n) {
+define(['page/events', 'views/i18n', 'helpers/browser'], function (events, i18n, browser) {
'use strict';
@@ -45,11 +45,17 @@ define(['page/events', 'views/i18n'], function (events, i18n) {
return $.ajax(url, config).fail(function (xmlhttprequest, textstatus, message) {
if (!config.skipErrorMessage) {
- var msg = (xmlhttprequest.responseJSON && xmlhttprequest.responseJSON.message) ||
+ var msg = (xmlhttprequest.responseJSON && xmlhttprequest.responseJSON.message) ||
messages[textstatus] ||
'unexpected problem while talking to server';
- on.trigger(document, events.ui.userAlerts.displayMessage, { message: i18n(msg) });
+ on.trigger(document, events.ui.userAlerts.displayMessage, {message: i18n(msg)});
}
+
+ if (xmlhttprequest.status === 302) {
+ var redirectUrl = xmlhttprequest.getResponseHeader('Location');
+ browser.redirect(redirectUrl);
+ }
+
}.bind(this));
}
diff --git a/web-ui/test/spec/services/mail_service.spec.js b/web-ui/test/spec/services/mail_service.spec.js
index 7fb2bfda..2cf69a9d 100644
--- a/web-ui/test/spec/services/mail_service.spec.js
+++ b/web-ui/test/spec/services/mail_service.spec.js
@@ -130,6 +130,24 @@ 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;