SmartFit
/
SmartFit_API
3
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

🥅 resolve no authorization header error
continuous-integration/drone/push Build is passing Details

Browse Source
pull/4/head
remrem 1 year ago
parent db402dd90a
commit af39e3dc6e
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File

38
app/routes.php
Unescape View File

@ -55,10 +55,10 @@ return function (App $app) {
// Delete User // Delete User
$app->delete('/user', function (Request $req, Response $res) { $app->delete('/user', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0]; if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
if (!(new Token)->verifyToken($token)) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$uuid = (new Token)->getUuidFromToken($token); $uuid = (new Token)->getUuidFromToken($token);
$code = (new UserGateway)->deleteUser($uuid); $code = (new UserGateway)->deleteUser($uuid);
@ -94,10 +94,10 @@ return function (App $app) {
}); });
$app->get('/user/info', function (Request $req, Response $res) { $app->get('/user/info', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0]; if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
if (!(new Token)->verifyToken($token)) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$uuid = (new Token)->getUuidFromToken($token); $uuid = (new Token)->getUuidFromToken($token);
$code = (new UserGateway)->getInfo($uuid); $code = (new UserGateway)->getInfo($uuid);
@ -114,10 +114,10 @@ return function (App $app) {
// Update Mail // Update Mail
$app->put('/user/email', function (Request $req, Response $res) { $app->put('/user/email', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0]; if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
if (!(new Token)->verifyToken($token)) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
if (!Helpers::validJson((string) $req->getBody(), array("email"))) { if (!Helpers::validJson((string) $req->getBody(), array("email"))) {
return $res->withStatus(400); return $res->withStatus(400);
@ -132,10 +132,10 @@ return function (App $app) {
// Update Username // Update Username
$app->put('/user/username', function (Request $req, Response $res) { $app->put('/user/username', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0]; if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
if (!(new Token)->verifyToken($token)) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
if (!Helpers::validJson((string) $req->getBody(), array("username"))) { if (!Helpers::validJson((string) $req->getBody(), array("username"))) {
return $res->withStatus(400); return $res->withStatus(400);
@ -151,10 +151,10 @@ return function (App $app) {
// Update Password // Update Password
$app->put('/user/password', function (Request $req, Response $res) { $app->put('/user/password', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0]; if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
if (!(new Token)->verifyToken($token)) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
if (!Helpers::validJson((string) $req->getBody(), array("hash"))) { if (!Helpers::validJson((string) $req->getBody(), array("hash"))) {
return $res->withStatus(400); return $res->withStatus(400);
@ -170,11 +170,11 @@ return function (App $app) {
#### FILES #### #### FILES ####
// Get list of files // Get list of files
$app->get('/user/files', function (Request $req, Response $res) { $app->get('/user/files', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0];
$save_folder = '/home/hel/smartfit_hdd'; $save_folder = '/home/hel/smartfit_hdd';
if (!(new Token)->verifyToken($token)) { if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$uuid = (new Token)->getUuidFromToken($token); $uuid = (new Token)->getUuidFromToken($token);
$code = (new FileGateway)->listFiles($uuid); $code = (new FileGateway)->listFiles($uuid);
@ -185,12 +185,12 @@ return function (App $app) {
// Get file // Get file
$app->get('/user/files/{uuid}', function (Request $req, Response $res, $args) { $app->get('/user/files/{uuid}', function (Request $req, Response $res, $args) {
$token = $req->getHeader('Authorization')[0];
$file_uuid = $args['uuid']; $file_uuid = $args['uuid'];
$save_folder = '/home/hel/smartfit_hdd'; $save_folder = '/home/hel/smartfit_hdd';
if (!(new Token)->verifyToken($token)) { if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$user_uuid = (new Token)->getUuidFromToken($token); $user_uuid = (new Token)->getUuidFromToken($token);
$filename = (new FileGateway)->getFilename($file_uuid, $user_uuid); $filename = (new FileGateway)->getFilename($file_uuid, $user_uuid);
@ -208,12 +208,12 @@ return function (App $app) {
// Delete file // Delete file
$app->delete('/user/files/{uuid}', function (Request $req, Response $res, $args) { $app->delete('/user/files/{uuid}', function (Request $req, Response $res, $args) {
$token = $req->getHeader('Authorization')[0];
$file_uuid = $args['uuid']; $file_uuid = $args['uuid'];
$save_folder = '/home/hel/smartfit_hdd'; $save_folder = '/home/hel/smartfit_hdd';
if (!(new Token)->verifyToken($token)) { if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$user_uuid = (new Token)->getUuidFromToken($token); $user_uuid = (new Token)->getUuidFromToken($token);
$filename = (new FileGateway)->getFilename($file_uuid, $user_uuid); $filename = (new FileGateway)->getFilename($file_uuid, $user_uuid);
@ -237,13 +237,13 @@ return function (App $app) {
// Upload file // Upload file
#file_put_contents("test_save_upload.bin", $file->getStream()->getContents()); #file_put_contents("test_save_upload.bin", $file->getStream()->getContents());
$app->post('/user/files', function (Request $req, Response $res) { $app->post('/user/files', function (Request $req, Response $res) {
$token = $req->getHeader('Authorization')[0];
$save_folder = '/home/hel/smartfit_hdd'; $save_folder = '/home/hel/smartfit_hdd';
if (!(new Token)->verifyToken($token)) { if (!(new Token)->verifyToken($req->getHeader('Authorization'))) {
return $res->withStatus(401); return $res->withStatus(401);
} }
$token = $req->getHeader('Authorization')[0];
$uuid = (new Token)->getUuidFromToken($token); $uuid = (new Token)->getUuidFromToken($token);
$file = $req->getUploadedFiles()['file']; $file = $req->getUploadedFiles()['file'];
$category = $req->getParsedBody()['SmartFit_Category']; $category = $req->getParsedBody()['SmartFit_Category'];
$creation_date = $req->getParsedBody()['SmartFit_Date']; $creation_date = $req->getParsedBody()['SmartFit_Date'];

7
app/token.php
Unescape View File

@ -31,11 +31,14 @@ class Token
} }
// Verify the JWT authenticity // Verify the JWT authenticity
public function verifyToken(string $jwt): bool public function verifyToken(array $authorization_header): bool
{ {
if(count($authorization_header) === 0) return false;
$jwt = $authorization_header[0];
try { try {
JWT::decode($jwt, new Key($this->key, 'HS256')); JWT::decode($jwt, new Key($this->key, 'HS256'));
} catch (Exception $e) { } catch (Exception) {
return false; return false;
} }
return true; return true;

Write Preview
Loading…
Cancel
Save