From 78680c09f170357d58ad88cc28e77baf2ecf548d Mon Sep 17 00:00:00 2001 From: Evgenii Abramov Date: Tue, 30 Mar 2021 23:09:08 +0300 Subject: [PATCH] Filter devices by allowed users --- routes/user.js | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/routes/user.js b/routes/user.js index 6813383..d3f230c 100644 --- a/routes/user.js +++ b/routes/user.js @@ -20,11 +20,10 @@ module.exports.ping = [ module.exports.devices = [ passport.authenticate('bearer', {session: true}), (req, res) => { - const [reqId, authToken] = [req.get('X-Request-Id'), String(req.get('Authorization')).split(' ')[1]]; + const [reqId, authToken] = [req.get('X-Request-Id'), req.get('Authorization').split(' ')[1]]; try { - const ltoken = global.authl.findOne({'token': authToken}); - const {userId} = ltoken; + const {userId} = global.authl.findOne({'token': authToken}); const r = { request_id: reqId, @@ -34,12 +33,8 @@ module.exports.devices = [ } }; - for (const d of global.devices) { - const {allowedUsers} = d.meta; - if (Array.isArray(allowedUsers) && allowedUsers.indexOf(userId) > -1) { - console.log(d.getInfo()); - r.payload.devices.push(d.getInfo()); - } + for (const d of global.devices.filter(d => Array.isArray(d.meta.allowedUsers) && d.meta.allowedUsers.indexOf(userId) > -1)) { + r.payload.devices.push(d.getInfo()); }; res.status(200).send(r);