applay-utils 1.8.28 → 1.8.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applay-utils",
-  "version": "1.8.28",
+  "version": "1.8.32",
   "description": "Utilitary tools for Applay applications",
   "scripts": {
     "build": "npm version patch",

package/utils/crypto.js

@@ -1,36 +1,47 @@
-var CryptoJS = require('crypto-js');
-var algorithm = 'aes-256-cbc';
-var key = process.env.key;
+const CryptoJS = require('crypto-js');
+const algorithm = 'aes-256-cbc';
 const sha1 = require('sha1');
 
-var utils = {
+module.exports = {
     'genHash': (orig) => {
-        if (!key) return null;
+        if (!process.env.key) return null;
         var json = Object({}, orig);
         if (json._id) { delete json._id; }
         if (json.apyId) { delete json.apyId; }
-        var block = `KEY=>${key}|JSON=>${JSON.stringify(json)}`;
+        var block = `KEY=>${process.env.key}|JSON=>${JSON.stringify(json)}`;
         orig.apyId = sha1(block);
         return orig;
     },
     'verifyHash': (orig) => {
-        if (!key) return null;
+        if(!process.env.key) {
+            console.error('Key not set, cannot verifyHash data');
+            return null;
+        }
+        
         var json = utils.genHash(Object({}, orig));
         console.log(json.apyId, orig.apyId);
         return json.apyId == orig.apyId
     },
-    'setKey': (newkey)=>{key=newkey},
+    'setKey': (newkey)=>{process.env.key=newkey},
     'genIV': () => {
         return Math.random().toString(36).substr(2, 30);
     },
     'encrypt': (text, iv) => {
-        if(!key) return null;
-        let base = CryptoJS.AES.encrypt(text, key, { iv: iv });
+        if(!process.env.key) {
+            console.error('Key not set, cannot encrypt data');
+            return null;
+        }
+
+        let base = CryptoJS.AES.encrypt(text, process.env.key, { iv: iv });
         return base.toString();
     },
     'decrypt': (text, iv) => {
-        if(!key) return null;
-        let data = CryptoJS.AES.decrypt(text, key, { iv: iv }).toString(CryptoJS.enc.Utf8);
+        if(!process.env.key) {
+            console.error('Key not set, cannot decrypt data');
+            return null;
+        }        
+        
+        let data = CryptoJS.AES.decrypt(text, process.env.key, { iv: iv }).toString(CryptoJS.enc.Utf8);
         return data;
     },
     'protect': (data) => {
@@ -38,13 +49,14 @@ var utils = {
         return { cipher: utils.encrypt(JSON.stringify(data), iv), iv: iv, protect: true, app_key: '', app_secret: '' }
     },
     'extract': (data) => {
-        if(!key) return null;
+        if(!process.env.key) {
+            console.error('Key not set, cannot extract data');
+            return null;
+        }
         return JSON.parse(utils.decrypt(data.cipher, data.iv));
     },
     'envelope': (dataFull) => {
         dataFull.data = utils.protect(dataFull.data);
         return dataFull;
     }
-}
-
-module.exports=utils;
+}

package/utils/jwt.js

@@ -1,28 +1,27 @@
 const jwt = require('jsonwebtoken');
-var key = process.env.key;
-var keyportal = process.env.keyportal;
+// var process.env.key = process.env.process.env.key;
+// var process.env.keyportal = process.env.process.env.keyportal;
 
 
-var utils = {
-  'setKey': (newkey) => { key = newkey; },
-  'setKeyPortal': (newkey) => { keyportal = newkey; },
-  'checkPortal': (keyCheck) => keyCheck == keyportal,
+module.exports = {
+  'setKey': (newkey) => { process.env.key = newkey; },
+  'setKeyPortal': (newkey) => { process.env.keyportal = newkey; },
+  'checkPortal': (keyCheck) => keyCheck == process.env.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 (!process.env.key) return res.status(401).json({ auth: false, message: 'Sem process.env.key definida.' });
+    jwt.verify(token, process.env.key, (err, decoded) => {
       if (err) return res.status(401).json({ auth: false, message: 'Falha na autenticação do token.' });
       req.tokenId = decoded.id;
       next();
     });
   },
   'login': (id, time) => {
-    if (!key) return null;
-    const token = jwt.sign({ id }, key, {
+    if (!process.env.key) return null;
+    const token = jwt.sign({ id }, process.env.key, {
       expiresIn: time || (60 * 30) // segundos
     });
     return token;
   }
-}
-module.exports = utils;
+}