LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(js) Improve CAS handling

Browse source
This commit is contained in:
Francis Lachapelle 2017-03-01 11:14:59 -05:00
parent a29ced853a
commit a3d7ae3a6b
1 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
UI/WebServerResources/js/Common/Common.app.js
View file

@ -259,38 +259,27 @@
function ErrorInterceptor($rootScope, $q, $injector) { function ErrorInterceptor($rootScope, $q, $injector) {
return { return {
responseError: function(rejection) { responseError: function(rejection) {
// Handle CAS ticket renewal (TODO: add check on usesCASAuthentication) var deferred, iframe;
if (rejection.status == -1) { // Handle CAS ticket renewal (TODO: add check on usesCASAuthentication)
var deferred = $q.defer(); if (rejection.status == -1) {
var iframe = angular.element('<iframe class="ng-hide" src="' + UserFolderURL + 'recover"></iframe>'); deferred = $q.defer();
iframe = angular.element('<iframe class="ng-hide" src="' + UserFolderURL + 'recover"></iframe>');
iframe.on('load', function() { iframe.on('load', function() {
var $http = $injector.get('$http'); // Once the browser has followed the redirection, send the initial request
var $http = $injector.get('$http');
if (rejection.config.method == 'GET') { $http(rejection.config).then(deferred.resolve, deferred.reject);
$http({ iframe.remove();
method: 'GET', });
url: rejection.config.url document.body.appendChild(iframe[0]);
}).then(deferred.resolve, deferred.reject); return deferred.promise;
} }
else if (rejection.config.method == 'POST') { else {
$http({ if (/^application\/json/.test(rejection.config.headers.Accept)) {
method: 'POST', // Broadcast the response error
url: rejection.config.url, $rootScope.$broadcast('http:Error', rejection);
data: rejection.config.data
}).then(deferred.resolve, deferred.reject);
}
});
document.body.appendChild(iframe[0]);
return deferred.promise;
}
else {
if (/^application\/json/.test(rejection.config.headers.Accept)) {
// Broadcast the response error
$rootScope.$broadcast('http:Error', rejection);
}
return $q.reject(rejection);
} }
return $q.reject(rejection);
}
} }
}; };
} }