Skip to content
Snippets Groups Projects
Commit 27e1b0fc authored by narindra.rajohnso's avatar narindra.rajohnso
Browse files

correct api routes

parent ff5ac252
No related branches found
No related tags found
No related merge requests found
No preview for this file type
...@@ -108,14 +108,12 @@ export function createAccountCheck(req: express.Request, res: express.Response){ ...@@ -108,14 +108,12 @@ export function createAccountCheck(req: express.Request, res: express.Response){
if(result[0] !== -1){ if(result[0] !== -1){
if(result[1] === "User") res.status(StatusCodes.OK).json({new_user: { if(result[1] === "User") res.status(StatusCodes.OK).json({new_user: {
username: data.username, username: data.username,
password: data.password,
lastname: data.lastname, lastname: data.lastname,
firstname: data.firstname, firstname: data.firstname,
email: data.email email: data.email
}}); }});
if(result[1] === "Admin") res.status(StatusCodes.OK).json({new_admin: { if(result[1] === "Admin") res.status(StatusCodes.OK).json({new_admin: {
username: data.username, username: data.username,
password: data.password,
lastname: data.lastname, lastname: data.lastname,
firstname: data.firstname, firstname: data.firstname,
email: data.email email: data.email
......
...@@ -23,6 +23,11 @@ const router: express.Router = express.Router(); ...@@ -23,6 +23,11 @@ const router: express.Router = express.Router();
router.get('/:admin/users', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => { router.get('/:admin/users', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => {
try { try {
const users = await Database.getAllUsers(); 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}); res.status(StatusCodes.OK).json({users});
} catch (error) { } catch (error) {
res.status(StatusCodes.BAD_REQUEST).json({ message: `An error occured: ${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 ...@@ -35,6 +40,8 @@ router.get('/:admin/questions', checkExistingUser, verifyToken, async (req: exp
questions.forEach(q => { questions.forEach(q => {
q.possibleResponse = JSON.parse(q.possibleResponse); q.possibleResponse = JSON.parse(q.possibleResponse);
q.correctResponse=parseInt(String(q.correctResponse)); q.correctResponse=parseInt(String(q.correctResponse));
delete q.dataValues.createdAt;
delete q.dataValues.updatedAt;
}); });
res.status(StatusCodes.OK).json({ questions: questions }); res.status(StatusCodes.OK).json({ questions: questions });
...@@ -175,7 +182,9 @@ router.delete('/:admin/questions/:question_id', checkExistingUser, checkIdField, ...@@ -175,7 +182,9 @@ router.delete('/:admin/questions/:question_id', checkExistingUser, checkIdField,
router.get('/:admin', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => { router.get('/:admin', checkExistingUser, verifyToken, async (req: express.Request, res: express.Response) => {
const username = req.params.admin const username = req.params.admin
let user=await Database.infoUser(username); let user=await Database.infoUser(username);
user.dataValues.password="CONFIDENTIAL!!!" delete user.dataValues.password;
delete user.dataValues.createdAt;
delete user.dataValues.updatedAt;
if(user){ if(user){
res.status(StatusCodes.OK).json({info_user: user.dataValues}); res.status(StatusCodes.OK).json({info_user: user.dataValues});
}else{ }else{
......
...@@ -6,7 +6,7 @@ import {checkExistingUser, TokenRequest, verifyToken} from "./middleware"; ...@@ -6,7 +6,7 @@ import {checkExistingUser, TokenRequest, verifyToken} from "./middleware";
const router: express.Router = express.Router(); 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}); res.status(StatusCodes.OK).json({access_user: req.user});
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment