delore-crm-core 1.0.7 → 1.0.10

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "cSpell.words": ["corbtnbg", "corbtnfg", "sysname", "tokenadm", "userid"]
+}

package/README.md

@@ -61,7 +61,6 @@ Funções principais:
 - `access.addMenu(method, path, name, desc, group, fn)`
 - `access.addOpen(method, path, name, desc, group, fn)`
 - `access.addNoAccessControl(method, path, fn)`
-- `access.addEsp(name, desc, group)`
 - `access.makeRouter()`
 - `access.getAccess()`
 - `access.makeAccessScope()`

package/auth/ret.js

@@ -80,7 +80,7 @@ exports.returnLogin = async function (dados, owner, user, board, exp, lat, lng,
       var tokenDados = {
          exp: exp,
          sub: dados.id,
-         userId: user ? user.id : null,
+         userId: user.id,
          access: user.access,
       };
       var serialize = JSON.stringify(tokenDados);
@@ -103,7 +103,7 @@ exports.returnLogin = async function (dados, owner, user, board, exp, lat, lng,
          instView: user ? user.instView : null,
          visLea: user.visLea,
          access: user.access,
-         accessAll: access.makeAccessScopeAll(),
+         accessAll: access.makeAccessScopeAll('app'),
          fChangePass: user.fChangePass,
          datePass: user.datePass,
          qtdreg: user.qtdreg,
@@ -130,21 +130,14 @@ exports.validToken = async function (req) {
 
       var resource = access.getResourceFromReq(req);
       var token = JSON.parse(jwt.decode(req.headers.token, secret));
-      var now = Date.now();
-      var id = req.headers.id;
-      var userId = req.headers.userid;
-      var tokenAccess = token.access;
 
-      if (now > token.exp) {
+      req.headers.id = token.sub;
+      req.headers.userId = token.userId;
+
+      if (Date.now() > token.exp) {
          return { status: 401, message: 'Código 002 - Token expirado! por favor faça o login novamente.' };
-      } else if (id == '') {
-         return { status: 401, message: 'Acesso indevido!' };
-      } else if (token.userId != userId) {
-         return { status: 401, message: 'Acesso indevido!' };
-      } else if (token.sub != id) {
-         return { status: 401, message: 'Acesso indevido!' };
       } else {
-         if (tokenAccess.includes(resource.id) || !resource.accessControl) {
+         if (token.access.includes(resource.id) || !resource.accessControl) {
 
             return { status: 200, message: 'Token válido' };
 
@@ -168,7 +161,7 @@ exports.makeTokenSocketIo = function (id) {
          exp: new Date().getTime() + 1000 * 60 * 60 * 24 * 30, // 30 dias
       };
       var serialize = JSON.stringify(tokenDados);
-      var token = jwt.encode(serialize, 'socketIoCrm23');
+      var token = jwt.encode(serialize, process.env.SECRET_JWT_SOCKET_IO);
       return token;
    } catch (e) {
       return null;
@@ -181,7 +174,7 @@ exports.validTokenSocketIo = function (tokenSend, idSend) {
          return { status: 401, message: 'Não foi informado token' };
       }
 
-      var token = JSON.parse(jwt.decode(tokenSend, 'socketIoCrm23'));
+      var token = JSON.parse(jwt.decode(tokenSend, process.env.SECRET_JWT_SOCKET_IO));
       var now = Date.now();
       var id = idSend;
 
@@ -199,14 +192,16 @@ exports.validTokenSocketIo = function (tokenSend, idSend) {
    }
 };
 
-exports.returnLoginADM = function (dados, exp) {
+exports.returnLoginADM = function (dados, user, exp) {
    try {
       var tokenDados = {
          exp: exp,
-         sub: dados.id,
+         sub: dados.id, // owner id
+         userId: user.id,
+         access: user.access,
       };
       var serialize = JSON.stringify(tokenDados);
-      var token = jwt.encode(serialize, 'owner23');
+      var token = jwt.encode(serialize, process.env.SECRET_JWT_ADM_PANEL);
       return {
          tokenadm: token,
          id: dados.id,
@@ -216,6 +211,13 @@ exports.returnLoginADM = function (dados, exp) {
          ema: dados.ema,
          domain: dados.domain,
 
+         userid: user.id,
+         username: user.name,
+         useremail: user.email,
+
+         access: user.access,
+         accessAll: access.makeAccessScopeAll('adm'),
+
          sysname: dados.sysname,
          logo: dados.logo,
          favicon: dados.favicon,
@@ -233,18 +235,30 @@ exports.validTokenADM = function (req) {
          return { status: 401, message: 'Não foi informado tokenadm' };
       }
 
-      var token = JSON.parse(jwt.decode(req.headers.tokenadm, 'owner23'));
+      var resource = access.getResourceFromReq(req);
+      var token = JSON.parse(jwt.decode(req.headers.tokenadm, process.env.SECRET_JWT_ADM_PANEL));
       var now = Date.now();
-      var id = req.headers.id;
+
+      req.headers.ownerId = token.sub; // ownerId
+      req.headers.userId = token.userId;
 
       if (now > token.exp) {
          return { status: 401, message: 'Código 002 - Token expirado! por favor faça o login novamente.' };
-      } else if (id == '') {
-         return { status: 401, message: 'Acesso indevido!' };
-      } else if (token.sub != id) {
-         return { status: 401, message: 'Acesso indevido!' };
       } else {
-         return { status: 200, message: 'Token válido' };
+         if (token.access.includes(resource.id) || !resource.accessControl) {
+
+            return { status: 200, message: 'Token válido' };
+
+         } else {
+            return {
+               status: 401,
+               message: 'Acesso ao recurso não permitido! por favor, entre em contato com seu administrador.' +
+                  '\nCaminho do Recurso: ' +
+                  '\n- Grupo: ' + resource.group +
+                  '\n- Recurso: ' + resource.name +
+                  '\n- Descrição: ' + resource.desc,
+            };
+         }
       }
    } catch (error) {
       console.error(error);
@@ -259,7 +273,7 @@ exports.returnTokenMsg = function (autoMsgId, companyId) {
          companyId: companyId,
       };
       var serialize = JSON.stringify(payload);
-      var token = jwt.encode(serialize, 'msgToken23');
+      var token = jwt.encode(serialize, process.env.SECRET_JWT_MSG);
       return token;
    } catch (e) {
       return '';
@@ -271,7 +285,7 @@ exports.validTokenMSG = function (req) {
       if (!req.query.token) {
          return { status: 401, message: 'NOK - Não foi informado token' };
       }
-      var tokenDecoded = JSON.parse(jwt.decode(req.query.token, 'msgToken23'));
+      var tokenDecoded = JSON.parse(jwt.decode(req.query.token, process.env.SECRET_JWT_MSG));
       req.headers.id = parseInt(tokenDecoded.companyId);
       req.headers.automsgid = parseInt(tokenDecoded.autoMsgId);
       return { status: 200, message: 'Token válido' };
@@ -288,8 +302,7 @@ exports.returnLoginMASTER = function (dados, exp) {
          sub: dados.id,
       };
       var serialize = JSON.stringify(tokenDados);
-      var secret = 'master23';
-      var token = jwt.encode(serialize, secret);
+      var token = jwt.encode(serialize, process.env.SECRET_JWT_MASTER_PANEL);
       return {
          tokenmaster: token,
          id: dados.id,
@@ -307,7 +320,7 @@ exports.validTokenMASTER = function (req) {
          return { status: 401, message: 'Não foi informado token' };
       }
 
-      var token = JSON.parse(jwt.decode(req.headers.tokenmaster, 'master23'));
+      var token = JSON.parse(jwt.decode(req.headers.tokenmaster, process.env.SECRET_JWT_MASTER_PANEL));
       var now = Date.now();
       var id = req.headers.id;
 
@@ -333,8 +346,7 @@ exports.returnLoginDEVELOPER = function (dados, exp) {
          sub: dados.id,
       };
       var serialize = JSON.stringify(tokenDados);
-      var secret = 'developer23';
-      var token = jwt.encode(serialize, secret);
+      var token = jwt.encode(serialize, process.env.SECRET_JWT_DEVELOPER_PANEL);
       return {
          token: token,
          id: dados.id,
@@ -352,7 +364,7 @@ exports.validTokenDEVELOPER = function (req) {
       if (!req.headers.token || req.headers.token === 'undefined' || req.headers.token == '') {
          return { status: 401, message: 'Não foi informado token. Por favor, entre em contato com o administrador.' };
       }
-      var token = JSON.parse(jwt.decode(req.headers.token, 'developer23'));
+      var token = JSON.parse(jwt.decode(req.headers.token, process.env.SECRET_JWT_DEVELOPER_PANEL));
       var now = Date.now();
 
       if (now > token.exp) {
@@ -375,8 +387,7 @@ exports.makeTokenForRememberUser = function (company, user, exp) {
          "exp": exp
       }
       var serialize = JSON.stringify(tokenDados);
-      var secret = process.env.SECRET_REMEMBER_USER;
-      var token = jwt.encode(serialize, secret);
+      var token = jwt.encode(serialize, process.env.SECRET_REMEMBER_USER);
       return token;
    } catch (e) {
       return "";

package/db/models.js

@@ -17,6 +17,9 @@ const models = {
    ExportModels: function () {
       return exportModels();
    },
+   exportModelsToFileMD: function () {
+      return exportModelsToFileMD();
+   },
    addModel: function (name, model) {
       listModels.push({ table: name, model: model });
    },
@@ -558,6 +561,39 @@ async function exportModels() {
    }
 }
 
+async function exportModelsToFileMD() {
+   logger.debug('Start Export Models to File MD');
+   try {
+      if (!fs.existsSync('../crm_models')) {
+         fs.mkdirSync('../crm_models');
+      }
+      var markdownTable = '# Tables information' + '\n';
+      for (var i = 0; i < listModels.length; i++) {
+         var model = listModels[i];
+         markdownTable += '## Table: ' + model.model.name + '\n';
+         for (const key in model.model.fieldRawAttributesMap) {
+            const field = model.model.fieldRawAttributesMap[key];
+            var fieldName = field.fieldName;
+            var fieldLength = field.type.options && field.type.options.length ? field.type.options.length : '';
+            var fieldType = field.type.constructor.key + (fieldLength ? ' (' + fieldLength + ')' : '');
+            var fieldComment = field.comment || 'No comment';
+            var fieldRequired = field.allowNull ? 'false' : 'true';
+            var fieldDefault = field.defaultValue || 'No default';
+            markdownTable += '- Field: ' + fieldName
+               + ' | Type: ' + fieldType
+               + ' | Comment: ' + fieldComment
+               + ' | Required: ' + fieldRequired
+               + ' | Default: ' + fieldDefault + '\n';
+         }
+         markdownTable += '---' + '\n';
+      }
+      fs.writeFileSync('../crm_models/crm_models.md', markdownTable);
+      logger.debug('Export Models to File MD Completed');
+   } catch (error) {
+      logger.error('Export Models to File MD Error: ' + error);
+   }
+}
+
 function getType(type, defaultValue, addColumn) {
    if (defaultValue == undefined) {
       if (type.constructor.key == 'INTEGER' || type.constructor.key == 'BIGINT' || type.constructor.key == 'DECIMAL') {
@@ -895,6 +931,7 @@ function getContentNumber(field) {
 }
 
 async function canDelete(tableName, id, companyId) {
+   const sequelize = require('delore-crm-core').sequelizeDB.getSequelize()
    var sql = 'Select sum(sub) total from (';
 
    var subSQL = '';
@@ -934,8 +971,8 @@ async function makeSQLTransf(tableName, idOri, idDes, companyId) {
 }
 
 async function canDelete2(tableName, id) {
+   const sequelize = require('delore-crm-core').sequelizeDB.getSequelize()
    var sql = 'Select sum(sub) total from (';
-
    var subSQL = '';
    listTablesValidDel.forEach((table) => {
       if (table.tableDelete === tableName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "delore-crm-core",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "Core CRM utilities for Delore projects",
   "main": "index.js",
   "type": "commonjs",

package/release.sh

@@ -14,7 +14,7 @@ git commit -m "$COMMIT_MSG"
 # Incrementa versão patch sem commit/tag automáticos
 npm version patch --no-git-tag-version
 
-# Comita a alteração de versão junto com o restante
+# Commit da alteração de versão junto com o restante
 git add -A
 git commit -m "$COMMIT_MSG"
 

package/utils/access.js

@@ -23,28 +23,32 @@ exports.setServiceName = function (serviceName) {
 
 // Configura acesso para rotas/todos usuários
 exports.add = function (method, path, name, desc, group, fn) {
-    list.push({ service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: false });
+    list.push({ panel: 'app', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: false });
+};
+
+exports.addAdm = function (method, path, name, desc, group, fn) {
+    list.push({ panel: 'adm', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: false });
 };
 
 exports.addMenu = function (method, path, name, desc, group, fn) {
-    list.push({ service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: true });
+    list.push({ panel: 'app', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: true });
+};
+exports.addMenuAdm = function (method, path, name, desc, group, fn) {
+    list.push({ panel: 'adm', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: false, isMenu: true });
 };
 
 // Configura acesso para rotas/todos usuários - Liberada por Padrão para usuário ativos já cadastrados
 exports.addOpen = function (method, path, name, desc, group, fn) {
-    list.push({ service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: true, isMenu: false });
+    list.push({ panel: 'app', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: true, isMenu: false });
 };
 
-// Configura acesso para rotinas
-exports.addEsp = function (name, desc, group) {
-    var id = shorthash2(name, desc, group);
-    list.push({ service: serviceName, id: id, type: 'esp', accessControl: true, method: 'esp', path: '', name: name, desc: desc, group: group, fn: null, general: false, opened: false });
-    return id;
+exports.addOpenAdm = function (method, path, name, desc, group, fn) {
+    list.push({ panel: 'adm', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: true, method: method, path: path, name: name, desc: desc, group: group, fn: fn, general: false, opened: true, isMenu: false });
 };
 
 // Configura acesso para rotas liberadas para todos usuários
 exports.addNoAccessControl = function (method, path, fn) {
-    list.push({ service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: false, method: method, path: path, name: '', desc: '', group: '', fn: fn, general: false, opened: false, isMenu: false });
+    list.push({ panel: 'app', service: serviceName, id: shorthash2(method + path), type: 'router', accessControl: false, method: method, path: path, name: '', desc: '', group: '', fn: fn, general: false, opened: false, isMenu: false });
 };
 
 exports.makeRouter = function () {
@@ -62,11 +66,11 @@ exports.makeRouter = function () {
     return router;
 };
 
-exports.makeAccessScope = function () {
+exports.makeAccessScope = function (panel) {
     var ret = '[';
     for (var i = 0; i < list.length; i++) {
-        if (list[i].accessControl) {
-            if (i == 0) {
+        if (list[i].accessControl && list[i].panel == panel) {
+            if (ret == '[') {
                 ret = ret + '"' + list[i].id + '"';
             } else {
                 ret = ret + ', ' + '"' + list[i].id + '"';
@@ -77,11 +81,11 @@ exports.makeAccessScope = function () {
     return ret;
 };
 
-exports.makeAccessScopeAll = function () {
+exports.makeAccessScopeAll = function (panel) {
     var ret = '[';
     for (var i = 0; i < list.length; i++) {
-        if (list[i].accessControl) {
-            if (i == 0) {
+        if (list[i].accessControl && list[i].panel == panel) {
+            if (ret == '[') {
                 ret = ret + '"' + list[i].id + '#' + list[i].name + '#' + list[i].desc + '#' + list[i].group + '#' + list[i].isMenu + '"';
             } else {
                 ret = ret + ', ' + '"' + list[i].id + '#' + list[i].name + '#' + list[i].desc + '#' + list[i].group + '#' + list[i].isMenu + '"';