amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-14 07:55:28 +00:00
Code Issues Projects Releases Wiki Activity

(js) follow requested URL after authentication

Browse Source
This commit is contained in:
Francis Lachapelle
2017-08-29 16:03:19 -04:00
parent ee7fdcba9f
commit a65e96bdb5
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/Authentication.service.js
+5 -11
View File
@@ -27,29 +27,23 @@
function Authentication() {
function redirectUrl(username, domain) {
var userName, address, baseAddress, altBaseAddress, parts, hostpart, protocol, newAddress;
var userName, address, baseAddress, parts, hostpart, protocol, newAddress;
userName = username;
if (domain)
userName += '@' + domain.value;
address = '' + window.location.href;
baseAddress = ApplicationBaseURL + '/' + encodeURIComponent(userName);
baseAddress = ApplicationBaseURL + encodeURIComponent(userName);
if (baseAddress[0] == '/') {
parts = address.split('/');
hostpart = parts[2];
protocol = parts[0];
baseAddress = protocol + '//' + hostpart + baseAddress;
}
parts = baseAddress.split('/');
parts.splice(0, 3);
altBaseAddress = parts.join('/');
if ((address.startsWith(baseAddress) || address.startsWith(altBaseAddress)) &&
!address.endsWith('/logoff')) {
if (address.startsWith(baseAddress) && !address.endsWith('/logoff'))
newAddress = address;
}
else {
else
newAddress = baseAddress;
}
return newAddress;
}
@@ -124,7 +118,7 @@
}
}
else {
d.resolve(redirectUrl(username, domain));
d.resolve({ url: redirectUrl(username, domain) });
}
}
}, function(response) {