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

fix(web(js)): handle SAML assertion expiration

pull/276/head
Francis Lachapelle 2020-05-28 14:53:31 -04:00
parent 105ca88aef
commit 6af55414fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/WebServerResources/js/Common/Common.app.js
View File

@ -335,8 +335,8 @@
// When expecting JSON but receiving HTML, assume session has expired and reload page // When expecting JSON but receiving HTML, assume session has expired and reload page
var $state; var $state;
if (response && /^application\/json/.test(response.config.headers.Accept) && if (response && /^application\/json/.test(response.config.headers.Accept) &&
/^[\n\r ]*<!DOCTYPE html/.test(response.data)) { /^[\n\r\t ]*<!DOCTYPE html/.test(response.data)) {
if ($window.usesCASAuthentication) { if ($window.usesCASAuthentication || $window.usesSAML2Authentication) {
return renewTicket($window, $q, $timeout, $injector, response); return renewTicket($window, $q, $timeout, $injector, response);
} }
else { else {
@ -360,7 +360,7 @@
responseError: function(rejection) { responseError: function(rejection) {
var $state; var $state;
if (/^application\/json/.test(rejection.config.headers.Accept)) { if (/^application\/json/.test(rejection.config.headers.Accept)) {
// Handle CAS ticket renewal // Handle SSO ticket renewal
if (($window.usesCASAuthentication || $window.usesSAML2Authentication) && rejection.status == -1) { if (($window.usesCASAuthentication || $window.usesSAML2Authentication) && rejection.status == -1) {
return renewTicket($window, $q, $timeout, $injector, rejection); return renewTicket($window, $q, $timeout, $injector, rejection);
} }