djpbessems/lucidAuth
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Periodic merge upstream #3

Merged
djpbessems merged 7 commits from development into master 2019-06-19 10:57:55 +00:00
Conversation 0 Commits 7 Files Changed 7 +5 -25
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dca8f74f25 - Show all commits

17
include/lucidAuth.template.php
View File

@@ -72,23 +72,6 @@ $pageLayout['full_alt'] = <<<'FULL_ALT'
</html> </html>
FULL_ALT; FULL_ALT;
$pageLayout['frames'] = <<<'FRAMES'
<!DOCTYPE html>
<html lang="nl">
<head>
<meta charset="utf-8" />
<title>lucidAuth</title>
<meta name="application-name" content="lucidAuth" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
<script src="misc/script.iframe.js"></script>
<script>%1$s</script>
</head>
<body>
%2$s
</body>
</html>
FRAMES;
$contentLayout['login'] = <<<'LOGIN' $contentLayout['login'] = <<<'LOGIN'
<script src="misc/script.index.js"></script> <script src="misc/script.index.js"></script>
<section> <section>

13
public/misc/script.index.js
View File

@@ -31,12 +31,6 @@ $(document).ready(function(){
'color': '#FFF' 'color': '#FFF'
}); });
if (data.CrossDomainLogin) { if (data.CrossDomainLogin) {
console.log('CrossDomainLogin initiated');
// do ajax in parallel, show progress,
// redirect once all finished loading or timeout after $X ms
// origin domain should be exempted from timeout
// (because origin domain can/will be different from current domain --due to traefik design).
var cookieDomains = JSON.parse(data.CookieDomains); var cookieDomains = JSON.parse(data.CookieDomains);
var XHR = []; var XHR = [];
cookieDomains.forEach(function(domain) { cookieDomains.forEach(function(domain) {
@@ -55,12 +49,15 @@ console.log('CrossDomainLogin initiated');
})); }));
}); });
$.when.apply($, XHR).then(function(){ $.when.apply($, XHR).then(function(){
$.each(arguments, function(_index, arg) { $.each(arguments, function(_index, _arg) {
console.log(JSON.stringify(arg)); // Show progress somehow (maybe something like https://minicss.org/v2/progress)
}); });
}); });
} }
// Finished (either succesfully or through timeout) cross-domain logins // Finished (either succesfully or through timeout) cross-domain logins
// redirect once all finished loading or timeout after $X ms
// origin domain should be exempted from timeout
// (because origin domain can/will be different from current domain --due to traefik design).
//window.location.replace(data.Location); //window.location.replace(data.Location);
}, 2250); }, 2250);
} else { } else {