From 1cbba7e2490b0d6e74419069e9f3fe2d51cfd16e Mon Sep 17 00:00:00 2001 From: "dorian.hodin" Date: Thu, 6 Apr 2023 11:46:30 +0200 Subject: [PATCH] Change gateway, change call of API in index.php --- API/script/Gateway/GatewayUser.php | 6 +++--- API/script/index.php | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/API/script/Gateway/GatewayUser.php b/API/script/Gateway/GatewayUser.php index 495ee26..6919df7 100644 --- a/API/script/Gateway/GatewayUser.php +++ b/API/script/Gateway/GatewayUser.php @@ -23,7 +23,7 @@ class GatewayUser } } - public function getUserPassword(string $login): ?string + public function getUserPassword(string $login): ?array { $query = "SELECT id,password FROM `user` WHERE login = :login"; $this->connection->executeQuery($query, array( @@ -45,13 +45,13 @@ class GatewayUser )); } - public function getAllUsers(): ?string + public function getAllUsers(): ?array { $query = "SELECT login FROM `user`"; $this->connection->executeQuery($query); $result = $this->connection->getResults(); if(empty($result)) return null; - return $result[0]['login']; + return $result; } } \ No newline at end of file diff --git a/API/script/index.php b/API/script/index.php index 15a41a8..4427233 100644 --- a/API/script/index.php +++ b/API/script/index.php @@ -97,26 +97,24 @@ $app->get('/getAllUsers', function(Request $request, Response $response){ return $response->withHeader('Content-type', 'application/json')->withStatus(200); }); -$app->get('/getUserPassword', function(Request $request, Response $response){ - $parameters = $request->getQueryParams(); - if (empty($parameters['login'])){ +$app->get('/getUserPassword/:login', function(Request $request, Response $response, String $login){ + if (empty($login)){ throw new TypeErrorParameters($request); } try{ - $response->getBody()->write(json_encode((new GatewayUser)->getUserPassword($parameters['login']), JSON_UNESCAPED_UNICODE)); + $response->getBody()->write(json_encode((new GatewayUser)->getUserPassword($login), JSON_UNESCAPED_UNICODE)); }catch (PDOException $e){ throw new PDOError($request,$e->getMessage(),$e); } return $response->withHeader('Content-type', 'application/json')->withStatus(200); }); -$app->post('/addUser', function(Request $request, Response $response){ - $parameters = $request->getQueryParams(); - if (empty($parameters['login']) || empty($parameters['password'])){ +$app->post('/addUser/:login/:password', function(Request $request, Response $response, String $login, String $password){ + if (empty($login) || empty($password)){ throw new TypeErrorParameters($request); } try{ - (new GatewayUser)->addUser($parameters['login'],$parameters['password']); + (new GatewayUser)->addUser($login,$password); }catch (PDOException $e){ throw new PDOError($request,$e->getMessage(),$e); }