From 27e1b0fc44c3ed0343f2a7aeb5068e43c30f361a Mon Sep 17 00:00:00 2001
From: "narindra.rajohnso" <narindra-hasimanjaka-david.rajohnson@etu.hesge.ch>
Date: Tue, 13 Jun 2023 15:24:31 +0200
Subject: [PATCH] correct api routes

---
 API/src/database/database.sqlite | Bin 20480 -> 20480 bytes
 API/src/routes/middleware.ts     |   2 --
 API/src/routes/router-admin.ts   |  11 ++++++++++-
 API/src/routes/router-gamer.ts   |   2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/API/src/database/database.sqlite b/API/src/database/database.sqlite
index ab49992f314c8ca671c6eceac1143c7dea7146dc..a74c5558ea90675f970a7f52c624bbbf3659a5af 100644
GIT binary patch
delta 209
zcmZozz}T>Wae_2s_e2?I#_o*?OZa7YIA=2QEAh4S_wl~v4dIdI+0EU<&B#^G#l|^v
zV`C*}S~ef2xT2t_x~QjTX>n?iVPSb{QAt&4W`03w9!LO$4IN4{OG@>UGe8_810!Qy
z12bJiV+8|CD<e}YV^cj-BU1%!0|P4q101rO|4Xv6$?)(eGw|o~U*><uzk~k{|7`vy
h{&oBn{Kxo{`Fl1CIym!lax#lEf-EuIoTEQQ0RX1cI}-o^

delta 208
zcmZozz}T>Wae_2s*F+g-#;%PCOZa8Dx!4%_mH68E`*`2-hVV%9?B?#_X5=d8V&j~(
zv9XFXm1jFcj<m3(s;H-DUTV3yMYeHXQEGZ#N@7`2Vpe`eUP)?ki9<<dNvU3PMrm<s
zk&%Isv95ucuAz~Fp^=q|iIs_^o|&<+g0_Kym4N{c+0FkYS=nT``EwcgbNMgxzvJJ*
me}{iIe-r;Y{tEtM{5||Vn*|-5`8oMlF>rxhu{lS7iUI)sLprSh

diff --git a/API/src/routes/middleware.ts b/API/src/routes/middleware.ts
index 56be529..9bba646 100644
--- a/API/src/routes/middleware.ts
+++ b/API/src/routes/middleware.ts
@@ -108,14 +108,12 @@ export function createAccountCheck(req: express.Request, res: express.Response){
             if(result[0] !== -1){
                 if(result[1] === "User") res.status(StatusCodes.OK).json({new_user: {
                         username: data.username,
-                        password: data.password,
                         lastname: data.lastname,
                         firstname: data.firstname,
                         email: data.email
                     }});
                 if(result[1] === "Admin") res.status(StatusCodes.OK).json({new_admin: {
                         username: data.username,
-                        password: data.password,
                         lastname: data.lastname,
                         firstname: data.firstname,
                         email: data.email
diff --git a/API/src/routes/router-admin.ts b/API/src/routes/router-admin.ts
index 0a96a17..7767d9d 100644
--- a/API/src/routes/router-admin.ts
+++ b/API/src/routes/router-admin.ts
@@ -23,6 +23,11 @@ const router: express.Router = express.Router();
 router.get('/:admin/users', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => {
     try {
         const users = await Database.getAllUsers();
+        users.forEach((user)=>{
+            delete user.dataValues.password;
+            delete user.dataValues.createdAt;
+            delete user.dataValues.updatedAt;
+        })
         res.status(StatusCodes.OK).json({users});
     } catch (error) {
         res.status(StatusCodes.BAD_REQUEST).json({ message: `An error occured: ${error}` });
@@ -35,6 +40,8 @@ router.get('/:admin/questions',  checkExistingUser, verifyToken, async (req: exp
         questions.forEach(q => {
             q.possibleResponse = JSON.parse(q.possibleResponse);
             q.correctResponse=parseInt(String(q.correctResponse));
+            delete q.dataValues.createdAt;
+            delete q.dataValues.updatedAt;
         });
 
         res.status(StatusCodes.OK).json({ questions: questions });
@@ -175,7 +182,9 @@ router.delete('/:admin/questions/:question_id', checkExistingUser, checkIdField,
 router.get('/:admin', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => {
     const username = req.params.admin
     let user=await Database.infoUser(username);
-    user.dataValues.password="CONFIDENTIAL!!!"
+    delete user.dataValues.password;
+    delete user.dataValues.createdAt;
+    delete user.dataValues.updatedAt;
     if(user){
         res.status(StatusCodes.OK).json({info_user: user.dataValues});
     }else{
diff --git a/API/src/routes/router-gamer.ts b/API/src/routes/router-gamer.ts
index b4c9e5f..3fee657 100644
--- a/API/src/routes/router-gamer.ts
+++ b/API/src/routes/router-gamer.ts
@@ -6,7 +6,7 @@ import {checkExistingUser, TokenRequest, verifyToken} from "./middleware";
 const router: express.Router = express.Router();
 
 
-router.get('/users/:username', checkExistingUser, verifyToken, (req: TokenRequest, res: express.Response) => {
+router.get('/:username', checkExistingUser, verifyToken, (req: TokenRequest, res: express.Response) => {
     res.status(StatusCodes.OK).json({access_user: req.user});
 });
 
-- 
GitLab