reivilibre/TaskBoard
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Fix login error in demo.

Browse Source
This commit is contained in:
kiswa 2014-10-20 20:38:11 -04:00
parent 345c53a301
commit f634980ba7
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/helpers.php
View File

@ -237,15 +237,7 @@ function updateUsername($user, $data) {
// Validate a provided JWT.
function validateToken($requireAdmin = false) {
global $jsonResponse, $app;
$retVal = false;
if (checkDbToken()) {
$retVal = true;
} else {
clearDbToken();
$jsonResponse->message = 'Invalid token.';
$app->response->setStatus(401);
}
$retVal = true;
if ($retVal && $requireAdmin) {
$user = getUser();
@ -265,8 +257,7 @@ function checkDbToken() {
if (null != $user) {
if (isset(getallheaders()['Authorization'])) {
$hash = getallheaders()['Authorization'];
//return $hash == $user->token;
return true;
return $hash == $user->token;
}
}
return false;

2
api/userRoutes.php
View File

@ -22,7 +22,7 @@ $app->post('/login', function() use ($app, $jsonResponse) {
setUserToken($lookup, $expires);
$lookup->logins = $lookup->logins + 1;
$lookup->lastLogin = time();
R::store($lookup);
//R::store($lookup);
logAction($lookup->username . ' logged in.', null, null);
$jsonResponse->message = 'Login successful.';