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

Compare commits

base: djpbessems:6081e42d148fd17bae5e0f89e2ebc18d4411ce89
Branches Tags
djpbessems:master djpbessems:development
djpbessems:0.6 djpbessems:0.5
...
compare: djpbessems:0.5
Branches Tags
djpbessems:development djpbessems:master
djpbessems:0.6 djpbessems:0.5

4 Commits
6081e42d14 ... 0.5

Author SHA1 Message Date
Danny Bessems
75e8640439 Merge branch 'development' of djpbessems/lucidAuth into master 2019-06-19 10:57:55 +00:00
Danny Bessems
dca8f74f25 Minor edits (housekeeping) 2019-06-19 10:55:01 +00:00
Danny Bessems
21f272e9f0 Renamed file to reflect actual purpose 2019-06-19 10:37:20 +00:00
Danny Bessems
5a2d3313e7 Added missing CORS headers and xhrFields 2019-06-19 10:34:31 +00:00
4 changed files with 11 additions and 36 deletions
Expand all files Collapse all files

17
include/lucidAuth.template.php
View File

@ -72,23 +72,6 @@ $pageLayout['full_alt'] = <<<'FULL_ALT'
</html>
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'
<script src="misc/script.index.js"></script>
<section>

2
public/lucidAuth.setXDomainCookie.php → public/lucidAuth.requestCookie.php
View File

@ -31,6 +31,8 @@
}))[0];
if (($cookieDomain && (is_null($httpOrigin) || $originDomain)) && setcookie('JWT', $queryString['token'], (time() + $settings->Session['Duration']), '/', '.' . $cookieDomain)) {
header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
header('Access-Control-Allow-Credentials: true');
header('Access-Control-Max-Age: 86400');
header("HTTP/1.1 202 Accepted");
exit;
}

10
public/misc/script.iframe.js
View File

@ -1,10 +0,0 @@
$(document).ready(function(){
$.post("lucidAuth.setXDomainCookie.php", {
do: "login",
ref: $('#ref').val()
})
.done(function(data,_status) {
if (data.Result === 'Success') {
}
});
});

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

@ -31,18 +31,15 @@ $(document).ready(function(){
'color': '#FFF'
});
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 XHR = [];
cookieDomains.forEach(function(domain) {
XHR.push($.get({
url: "https://auth." + domain + "/lucidAuth.setXDomainCookie.php",
url: "https://auth." + domain + "/lucidAuth.requestCookie.php",
crossDomain: true,
xhrFields: {
withCredentials: true,
},
data: {
ref: btoa(JSON.stringify({
action: 'login',
@ -52,12 +49,15 @@ console.log('CrossDomainLogin initiated');
}));
});
$.when.apply($, XHR).then(function(){
$.each(arguments, function(_index, arg) {
console.log(JSON.stringify(arg));
$.each(arguments, function(_index, _arg) {
// Show progress somehow (maybe something like https://minicss.org/v2/progress)
});
});
}
// 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);
}, 2250);
} else {