From cb405e32d1a66cb047aca44c81203a58cc5c2068 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Thu, 29 Oct 2015 10:18:54 +0100 Subject: Redirect user to login if ajax request fails with 302 - See project issue 162 - Should solve 'disconnected' problems --- web-ui/app/js/helpers/monitored_ajax.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'web-ui/app/js/helpers/monitored_ajax.js') 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 . */ -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)); } -- cgit v1.2.3