Compare commits

...

2 Commits

Author SHA1 Message Date
2f1beb47c7 Resolved mergeconflict 2019-12-06 12:56:31 +00:00
e520108237 Added CrossDomain logging to console 2019-12-06 12:55:10 +00:00

View File

@ -49,11 +49,19 @@ $(document).ready(function(){
token: data.SecureToken
}))
}
<<<<<<< HEAD
}).done(function(_data, _textStatus, jqXHR) {
NProgress.inc(1 / XHR.length);
console.log('CrossDomain login succeeded for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ']');
}).fail(function(jqXHR) {
console.log('CrossDomain login failed for domain `' + domain + '` [' + JSON.stringify(jqXHR) + ')]');
=======
}).done(function(data, textStatus) {
NProgress.inc(1 / XHR.length);
console.log('CrossDomain login step [' + data + ':' + textStatus + ']');
}).fail(function(_jqXHR, textStatus, errorThrown) {
console.log('CrossDomain login failed for at least one domain [' + textStatus + ':' + errorThrown + ']');
>>>>>>> c94b73606231da5206372f69103173d56135a960
// Should check why this failed (timeout or bad request?), and if this is the origin domain, take action
}));
});
@ -61,6 +69,7 @@ $(document).ready(function(){
$.each(arguments, function(_index, _arg) {
// Finished cross-domain logins (either successfully or through timeout)
NProgress.done();
console.log('CrossDomain login completed; forwarding to `' + data.Location + '`');
window.location.replace(data.Location);
});
});