amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

(js) Improve CAS handling

Browse Source
This commit is contained in:
Francis Lachapelle
2019-09-30 16:10:26 -04:00
parent 5b818e8ea9
commit bd9dfe6387
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/Common.app.js
+6 -6
View File
@@ -296,15 +296,15 @@
/**
* @ngInject
*/
AuthInterceptor.$inject = ['$window', '$q'];
function AuthInterceptor($window, $q) {
AuthInterceptor.$inject = ['$window', '$q', '$state'];
function AuthInterceptor($window, $q, $state) {
return {
response: function(response) {
// When expecting JSON but receiving HTML, assume session has expired and reload page
if (response && /^application\/json/.test(response.config.headers.Accept) &&
/^[\n\r ]*<!DOCTYPE html/.test(response.data)) {
angular.element($window).off('beforeunload');
$window.location.href = $window.ApplicationBaseURL;
$window.location.href = $window.ApplicationBaseURL + $state.href($state.current);
return $q.reject();
}
return response;
@@ -315,8 +315,8 @@
/**
* @ngInject
*/
ErrorInterceptor.$inject = ['$rootScope', '$window', '$q', '$timeout', '$injector'];
function ErrorInterceptor($rootScope, $window, $q, $timeout, $injector) {
ErrorInterceptor.$inject = ['$rootScope', '$window', '$q', '$timeout', '$injector', '$state'];
function ErrorInterceptor($rootScope, $window, $q, $timeout, $injector, $state) {
return {
responseError: function(rejection) {
var deferred, iframe;
@@ -350,7 +350,7 @@
else if ($window.usesSAML2Authentication && rejection.status == 401 && !$window.recovered) {
angular.element($window).off('beforeunload');
$window.recovered = true;
$window.location.href = $window.ApplicationBaseURL;
$window.location.href = $window.ApplicationBaseURL + $state.href($state.current);
}
else {
// Broadcast the response error