diff --git a/API/src/database/database.sqlite b/API/src/database/database.sqlite index ab49992f314c8ca671c6eceac1143c7dea7146dc..a74c5558ea90675f970a7f52c624bbbf3659a5af 100644 Binary files a/API/src/database/database.sqlite and b/API/src/database/database.sqlite differ diff --git a/API/src/routes/middleware.ts b/API/src/routes/middleware.ts index 56be529b503cdc9b0cbb9487d42d431675610299..9bba646d75a304b72cea95864505351691ebaf3b 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 0a96a17b840de3ddc8d20e0b6064a070e71dd671..7767d9d5d795f7b85b0f868d78825d47c5d69e39 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 b4c9e5f68cc86afbee1966fde56ff860ebfb11bf..3fee65709f104312f4f570fbc3e3d1aa246c3275 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}); });