Implemented GUI aspect of usermanagement page
TODO: add ajax-call that will update database
This commit is contained in:
@ -76,7 +76,7 @@ function storeToken (string $secureToken, string $qualifiedUsername, string $htt
|
||||
catch (Exception $e) {
|
||||
return ['status' => 'Fail', 'reason' => $e];
|
||||
}
|
||||
|
||||
|
||||
// Save authentication token in cookie clientside
|
||||
$cookieDomain = array_values(array_filter($settings->Session['CookieDomains'], function ($value) use ($httpHost) {
|
||||
// Check if $_SERVER['HTTP_HOST'] matches any of the configured domains (either explicitly or as a subdomain)
|
||||
@ -114,9 +114,9 @@ function validateToken (string $secureToken) {
|
||||
|
||||
// Retrieve all authentication tokens from database matching username
|
||||
$pdoQuery = $pdoDB->prepare('
|
||||
SELECT SecureToken.Value
|
||||
SELECT User.Id, SecureToken.Value
|
||||
FROM SecureToken
|
||||
LEFT JOIN User
|
||||
LEFT JOIN User
|
||||
ON (User.Id=SecureToken.UserId)
|
||||
WHERE User.Username = :username
|
||||
');
|
||||
@ -126,6 +126,7 @@ function validateToken (string $secureToken) {
|
||||
foreach($pdoQuery->fetchAll(PDO::FETCH_ASSOC) as $row) {
|
||||
try {
|
||||
$storedTokens[] = JWT::decode($row['Value'], base64_decode($settings->JWT['PrivateKey_base64']), $settings->JWT['Algorithm']);
|
||||
$currentUserId = $row['Id'];
|
||||
} catch (Exception $e) {
|
||||
continue;
|
||||
}
|
||||
@ -137,7 +138,8 @@ function validateToken (string $secureToken) {
|
||||
})) === 1) {
|
||||
return [
|
||||
'status' => 'Success',
|
||||
'name' => $jwtPayload->name
|
||||
'name' => $jwtPayload->name,
|
||||
'uid' => $currentUserId
|
||||
];
|
||||
} else {
|
||||
if ($settings->Debug['LogToFile']) {
|
||||
|
@ -33,7 +33,7 @@ $pageLayout['full'] = <<<'FULL'
|
||||
</html>
|
||||
FULL;
|
||||
|
||||
$pageLayout['full2'] = <<<'FULL2'
|
||||
$pageLayout['full_alt'] = <<<'FULL_ALT'
|
||||
<!DOCTYPE html>
|
||||
<html lang="nl">
|
||||
<head>
|
||||
@ -72,7 +72,7 @@ $pageLayout['full2'] = <<<'FULL2'
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
FULL2;
|
||||
FULL_ALT;
|
||||
|
||||
$pageLayout['bare'] = <<<'BARE'
|
||||
<!DOCTYPE html>
|
||||
@ -98,12 +98,12 @@ $contentLayout['login'] = <<<'LOGIN'
|
||||
<span class="indent"> </span>
|
||||
</li>
|
||||
<li>
|
||||
<label class="pre" for="username" data-translation="label_username">Gebruikersnaam:</label>
|
||||
<label class="pre" for="username" data-translation="label_username">Username:</label>
|
||||
<input type="text" id="username" name="username" tabindex="100" />
|
||||
<label for="username">@lucidAuth</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="pre" for="password" data-translation="label_password">Wachtwoord:</label>
|
||||
<label class="pre" for="password" data-translation="label_password">Password:</label>
|
||||
<input type="password" id="password" name="password" tabindex="200" />
|
||||
</li>
|
||||
<li>
|
||||
@ -111,7 +111,7 @@ $contentLayout['login'] = <<<'LOGIN'
|
||||
<button id="btnlogin" class="bttn-simple bttn-xs bttn-primary" tabindex="300" data-translation="button_login">login</button>
|
||||
</li>
|
||||
<li class="misc">
|
||||
<span class="indent" data-translation="span_credentialsavailable">Inloggegevens verkrijgbaar op aanvraag!</span>
|
||||
<span class="indent" data-translation="span_credentialsavailable">Login credentials available upon request!</span>
|
||||
</li>
|
||||
</ul>
|
||||
</section>
|
||||
@ -121,16 +121,13 @@ LOGIN;
|
||||
$contentLayout['manage']['header'] = <<<'MANAGE_HEADER'
|
||||
<script src="misc/script.editable.table.js"></script>
|
||||
<script src="misc/script.manage.js"></script>
|
||||
<span id="user"><span data-translation="span_loggedinas">Ingelogd als</span> %1$s --- [<a id="linklanguage-en" href="#" tabindex="700">EN</a> <a id="linklanguage-nl" class="current" href="#" tabindex="700">NL</a>] [<a href="#" tabindex="800" data-translation="link_logout">Log uit</a>]</span>
|
||||
<span id="user"><span data-translation="span_loggedinas">Logged in as</span> %1$s --- [<a id="linklanguage-en" href="#" tabindex="700">EN</a> <a id="linklanguage-nl" class="current" href="#" tabindex="700">NL</a>] [<a href="#" tabindex="800" data-translation="link_logout">Logout</a>]</span>
|
||||
<ul style="clear: both; margin-top: 20px;">
|
||||
<li class="buttons">
|
||||
<button id="btnnewuser" class="bttn-simple bttn-xs bttn-primary" data-translation="button_new">nieuw</button>
|
||||
<button id="btnfoo" class="bttn-simple bttn-xs bttn-primary" data-translation="button_foo">foo</button>
|
||||
<button id="btnbar" class="bttn-simple bttn-xs bttn-primary" data-translation="button_bar">bar</button>
|
||||
</li>
|
||||
<li class="buttons">
|
||||
<button id="btnsync" class="bttn-simple bttn-xs bttn-primary" data-translation="button_save">opslaan</button>
|
||||
<button id="btncancel" class="bttn-simple bttn-xs bttn-primary" data-translation="button_cancel">annuleren</button>
|
||||
<button id="btnnewuser" class="bttn-simple bttn-xs bttn-primary" data-translation="button_new">new</button>
|
||||
|
||||
<button id="btnsave" class="bttn-simple bttn-xs bttn-primary" data-translation="button_save">save</button>
|
||||
<button id="btncancel" class="bttn-simple bttn-xs bttn-primary" data-translation="button_cancel">cancel</button>
|
||||
</li>
|
||||
</ul>
|
||||
MANAGE_HEADER;
|
||||
@ -140,9 +137,9 @@ $contentLayout['manage']['section'] = <<<'MANAGE_SECTION'
|
||||
<table id="usertable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="immutable">Username</th>
|
||||
<th class="immutable">Role</th>
|
||||
<th class="immutable">Sessions</th>
|
||||
<th class="immutable" data-translation="th_username">Username</th>
|
||||
<th class="immutable" data-translation="th_role">Role</th>
|
||||
<th class="immutable" data-translation="th_manage">Manage</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
Reference in New Issue
Block a user