diff --git a/api/helpers.php b/api/helpers.php index f4d3739..e0786cb 100644 --- a/api/helpers.php +++ b/api/helpers.php @@ -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; diff --git a/api/userRoutes.php b/api/userRoutes.php index 40f9139..7268450 100644 --- a/api/userRoutes.php +++ b/api/userRoutes.php @@ -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.';