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

Periodic merge upstream #2

Manually merged
djpbessems merged 9 commits from development into master 2019-03-13 10:44:30 +00:00
Conversation 0 Commits 9 Files Changed 18 +6 -8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0a5384f6a8 - Show all commits

8
include/lucidAuth.functions.php
View File

@ -66,11 +66,11 @@ function storeToken (string $secureToken, string $qualifiedUsername, string $htt
INSERT INTO SecureToken (UserId, Value)
SELECT User.Id, :securetoken
FROM User
WHERE User.Username = :qualifiedusername
WHERE LOWER(User.Username) = :qualifiedusername
');
$pdoQuery->execute([
':securetoken' => $secureToken,
':qualifiedusername' => $qualifiedUsername
':qualifiedusername' => strtolower($qualifiedUsername)
]);
}
catch (Exception $e) {
@ -118,10 +118,10 @@ function validateToken (string $secureToken) {
FROM SecureToken
LEFT JOIN User
ON (User.Id=SecureToken.UserId)
WHERE User.Username = :username
WHERE LOWER(User.Username) = :username
');
$pdoQuery->execute([
':username' => (string)$jwtPayload->sub
':username' => (string) strtolower($jwtPayload->sub)
]);
foreach($pdoQuery->fetchAll(PDO::FETCH_ASSOC) as $row) {
try {

2
include/lucidAuth.template.php
View File

@ -14,7 +14,6 @@ $pageLayout['full'] = <<<'FULL'
<link href="misc/style.theme.css" rel="stylesheet" />
<link href="misc/style.button.css" rel="stylesheet" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.js"></script>
<script src="misc/script.theme.js"></script>
<script src="misc/script.translation.js"></script>
</head>
<body>
@ -47,7 +46,6 @@ $pageLayout['full_alt'] = <<<'FULL_ALT'
<link href="misc/style.theme.css" rel="stylesheet" />
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.js"></script>
<script src="misc/script.translation.js"></script>
<script src="misc/script.index.js"></script>
</head>
<body>
<div class="wrapper">