applay-utils 1.2.11 → 1.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applay-utils",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "Utilitary tools for Applay applications",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/utils/jwt.js

@@ -1,31 +1,36 @@
 const jwt = require('jsonwebtoken');
-var key=process.env.key;
+var key = process.env.key;
 var keyportal = process.env.keyportal;
 
 
 var utils = {
-    'setKey': (newkey) => {  key=newkey; },
-    'setKeyPortal': (newkey) => { keyportal = newkey; },
-    'checkPortal': (keyCheck) => keyCheck == keyportal,
-    'auth': (req, res, next) => {
-        const token = req.headers['x-access-token'];
-        if (!token) return res.status(401).json({ auth: false, message: 'Sem token definido.' });
-        if(!key) return res.status(401).json({ auth: false, message: 'Sem key definida.' });
-        jwt.verify(token, key, (err, decoded) => {
-        if (err) return res.status(401).json({ auth: false, message: 'Falha na autenticação do token.' });
-        req.userId = decoded.id.split('#')[0];
-        if (req.headers.cliente != decoded.id.split('#')[1]) {
-            return res.status(401).json({ auth: false, message: 'cliente diferente do token.' });
-        }
-        next();
-        });
-    },
-    'login': (id, time) => {
-        if(!key) return null;
-        const token = jwt.sign({ id }, key, {
-        expiresIn: time||(60 * 30) // segundos
-        });
-        return token;
-    }
+  'setKey': (newkey) => { key = newkey; },
+  'setKeyPortal': (newkey) => { keyportal = newkey; },
+  'checkPortal': (keyCheck) => keyCheck == keyportal,
+  'auth': (req, res, next) => {
+    const token = req.headers['x-access-token'];
+    if (!token) return res.status(401).json({ auth: false, message: 'Sem token definido.' });
+    if (!key) return res.status(401).json({ auth: false, message: 'Sem key definida.' });
+    jwt.verify(token, key, (err, decoded) => {
+      if (err) return res.status(401).json({ auth: false, message: 'Falha na autenticação do token.' });
+      req.userId = decoded.id.split('#')[0];
+      var cfgSystem = cfg.systems[req.hostname];
+      if (!cfgSystem) {
+        console.log('req.hostname', req.hostname);
+        return res.status(404).send({ msg: 'Hostname não encontrado', status: false, code: 404 });
+      }
+      if (cfgSystem.alias != decoded.id.split('#')[1]) {
+        return res.status(401).json({ auth: false, message: 'Alias diferente do token.' });
+      }
+      next();
+    });
+  },
+  'login': (id, time) => {
+    if (!key) return null;
+    const token = jwt.sign({ id }, key, {
+      expiresIn: time || (60 * 30) // segundos
+    });
+    return token;
+  }
 }
 module.exports = utils;

package/utils/mdb.js

@@ -54,22 +54,54 @@ var stopCustom = (customCallback) => {
 
 var genOpsUpdate = (data, params) => {
   var lista = [];
+
   for (var item of data) {
     let filter = item.filter;
     let update = item.update;
+
+    var novo = params && params.newField && item[params.newField];
+    var remove = params && params.removeField && item[params.removeField];
+
     if (params && params.type == 'array') {
       let objArray = {}
       let sub = params.rule.split('.');
-      objArray[params.rule] = item[sub[1]];
-      filter = Object.assign(objArray, params.filter)
+
       update = {};
-      update[sub[0] + '.$'] = item;
+
+      if (novo) {
+        delete item[params.newField];
+        update[sub[0]] = item;
+      }
+      else if (remove) {
+        delete item[params.removeField];
+        objArray[params.rule] = item[sub[1]];
+        let objRemove = {};
+        objRemove[sub[1]] = item[sub[1]];
+        update[sub[0]] = objRemove;
+      }
+      else {
+        objArray[params.rule] = item[sub[1]];
+        update[sub[0] + '.$'] = item;
+      }
+
+      filter = Object.assign(objArray, params.filter)
     }
+
     let objLista = {}
+    var upSet = { $set: update };
+
+    if (novo) {
+      upSet = { $addToSet: update };
+    }
+    else if (remove) {
+      upSet = { $pull: update };
+    }
+
     objLista['updateOne'] = {
       filter: filter,
-      update: { $set: update }
+      update: upSet
     }
+
     lista.push(objLista)
   }
   return lista