diff --git a/back/middlewares/loader.js b/back/middlewares/loader.js index d82e0d9828fa66411e5c268775223396f910951f..94dfd55602b864b1cb0a90a93790fb06fc1b49c0 100644 --- a/back/middlewares/loader.js +++ b/back/middlewares/loader.js @@ -3,7 +3,6 @@ const User = require('../models/user'); module.exports = async (req, res, next) => { if (req.get('Authorization')) { req.user = await User.findOne({ token: req.get('Authorization')}); - console.log(req.user); } next(); }; diff --git a/back/middlewares/loginChecker.js b/back/middlewares/loginChecker.js index c340d61cc2173c381671a07410b7e7748e2157fc..f4994b302199439bd5889456f3bb7574547d842a 100644 --- a/back/middlewares/loginChecker.js +++ b/back/middlewares/loginChecker.js @@ -1,5 +1,4 @@ module.exports = (req, res, next) => { - console.log(req.url); if (!req.user && !['/users', '/users/authenticate'].includes(req.url)) return res.status(401).json({ error: 'Authentication needed'}); return next(); }; \ No newline at end of file diff --git a/back/routes/users.js b/back/routes/users.js index 9b057072ba9efa18d6ec5dbd290ebb781bfc76a7..afbeea16f7bf18f42494998fb537222199534a36 100644 --- a/back/routes/users.js +++ b/back/routes/users.js @@ -16,8 +16,8 @@ router.post('/', (req, res) => { passwordHash, token }).then(user => { - delete user.passwordHash; - delete user.token; + user.passwordHash = undefined; + user.token = undefined; return res.status(201).json(user); }).catch(err => res.status(400).json({ error: err })); }); @@ -27,13 +27,17 @@ router.post('/authenticate', (req, res) => { User.findOne({ username: req.body.username }, (err, user) => { if (err) return res.status(500).json({ error: err }); if (!user) return res.status(404).json({ error: "User not found"}); - if (bcrypt.compareSync(req.body.password, user.passwordHash)) return res.json({ token: user.token }); + if (bcrypt.compareSync(req.body.password, user.passwordHash)) { + user.passwordHash = undefined; + return res.json(user); + } return res.status(400).json({ error: "Bad password" }); }); }); router.get('/me', (req, res) => { - // User required + req.user.passwordHash = undefined; + req.user.token = undefined; return res.json(req.user); })