djpbessems/lucidAuth
1
1
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
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5a2d3313e7 - Show all commits

2
public/lucidAuth.setXDomainCookie.php
View File

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

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

@ -43,6 +43,9 @@ console.log('CrossDomainLogin initiated');
XHR.push($.get({ XHR.push($.get({
url: "https://auth." + domain + "/lucidAuth.setXDomainCookie.php", url: "https://auth." + domain + "/lucidAuth.setXDomainCookie.php",
crossDomain: true, crossDomain: true,
xhrFields: {
withCredentials: true,
},
data: { data: {
ref: btoa(JSON.stringify({ ref: btoa(JSON.stringify({
action: 'login', action: 'login',