@pxp-nd/core 1.1.20 → 1.2.3

package/README.md

@@ -1,2 +1,2 @@
-# PXP-ND core
+# PXP-ND core
 - Core module for pxp-nd

package/dist/PxpApp.js

@@ -139,11 +139,11 @@ class PxpApp {
             await this.initializePassport(configPassport, getAuthRoutes, customAuthRoutes);
         }
         else {
-            throw new Error(`Invalid config Auth, set ConfigAuth:\n
-        \t// App.ts file
-        \timport { configAuth } from '@pxp-nd/auth';
-        \t// In constructror set...
-        \tthis.ConfigAuth  = configAuth;
+            throw new Error(`Invalid config Auth, set ConfigAuth:\n
+        \t// App.ts file
+        \timport { configAuth } from '@pxp-nd/auth';
+        \t// In constructror set...
+        \tthis.ConfigAuth  = configAuth;
         \t//...`);
         }
     }
@@ -182,12 +182,12 @@ class PxpApp {
         this.app.use(authRoutes);
         if (this.config.reports) {
             if (!this.Report && !this.ReportGroup) {
-                throw new Error(`Invalid Report configuration, set Report and ReportGroup entities:\n
-          \t// App.ts file
-          \timport { Report, ReportGroup } from '@pxp-nd/common';
-          \t//...
-          \tthis.Report  = Report;
-          \tthis.ReportGroup  = ReportGroup;
+                throw new Error(`Invalid Report configuration, set Report and ReportGroup entities:\n
+          \t// App.ts file
+          \timport { Report, ReportGroup } from '@pxp-nd/common';
+          \t//...
+          \tthis.Report  = Report;
+          \tthis.ReportGroup  = ReportGroup;
           `);
             }
             const reportRouter = report_routes_1.getReportsRouter(this.config, this.Report, this.ReportGroup);

package/dist/lib/pxp/Controller.js

@@ -121,10 +121,12 @@ class Controller {
         const permission = Reflect.getMetadata('permission', this.constructor) || {};
         // get log
         const log = Reflect.getMetadata('log', this.constructor) || {};
+        console.log('qqqqqqw', log);
         // get dbsettings
         const dbsettings = Reflect.getMetadata('dbsettings', this.constructor) || {};
         // get logConfig
         const logConfig = Reflect.getMetadata('logConfig', this.constructor) || {};
+        const defaultConfig = Reflect.getMetadata('optionsRoute', this.constructor) || {};
         // define basic routes
         if (this.modelString !== '') {
             routes = lodash_1.default.union(this.basicRoutes, routes);
@@ -132,15 +134,22 @@ class Controller {
         }
         routes.forEach((route) => {
             const methodDbSettings = dbsettings[route.methodName] || this.config.defaultDbSettings;
-            if (!(route.methodName in readonly)) {
+            // readOnly
+            const readOnlyMethod = readonly[route.methodName] !== undefined ? readonly[route.methodName] : defaultConfig[route.methodName].readOnly;
+            // log
+            const logMethod = log[route.methodName] !== undefined ? log[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].log : true);
+            const logValue = typeof logMethod == 'object' ? logMethod : logConfig[route.methodName];
+            const logKey = typeof logMethod == 'object' ? true : logMethod;
+            if (readOnlyMethod === null || readOnlyMethod === undefined) {
                 throw new index_1.PxpError(500, 'ReadOnly decorator was not defined for ' +
                     route.methodName +
                     ' in ' +
                     this.constructor.name +
                     ' controller.');
             }
-            if (route.methodName in authentication &&
-                authentication[route.methodName] === false) {
+            // auth
+            const auth = authentication[route.methodName] !== undefined ? authentication[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].authentication : true);
+            if (!auth) {
                 this.router[route.requestMethod](this.config.apiPrefix + '/' + this.module + this.path + route.path, 
                 // MIDDLEWARES AREA
                 [
@@ -156,7 +165,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readonly[route.methodName], false, log[route.methodName], logConfig[route.methodName]));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, logKey, logValue));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -169,6 +178,7 @@ class Controller {
                 });
             }
             else {
+                //NORMALMENTE VIENE POR AQUI RCM-20211011 *****
                 this.router[route.requestMethod](this.config.apiPrefix + '/' + this.module + this.path + route.path, 
                 // MIDDLEWARES AREA
                 [
@@ -189,14 +199,14 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readonly[route.methodName], permission[route.methodName], log[route.methodName], logConfig[route.methodName]));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, permission[route.methodName], logKey, logValue));
                     }
                     catch (ex) {
                         const now = new Date();
                         const iniAt = req.start;
                         const endsAt = now.valueOf() - iniAt.valueOf();
                         res.logId = (await index_1.__(index_1.insertLog(this.user && this.user.username ? this.user.username : 'nouser', 'mac', req.ip, 'error', ex.tecMessage, this.module, this.transactionCode, '', // query
-                        params, ex.stack, ex.statusCode, endsAt, logConfig)));
+                        params, ex.stack, ex.statusCode, endsAt, Object.assign(Object.assign({}, logConfig), { logValue }))));
                         index_1.errorMiddleware(ex, req, res);
                     }
                 });
@@ -251,6 +261,7 @@ class Controller {
             const endsAt = now.valueOf() - iniAt.valueOf();
             index_1.__(index_1.insertLog(this.user && this.user.username ? this.user.username : 'nouser', 'mac', req.ip, 'success', 'successful transaction', this.module, this.transactionCode, '', params, JSON.stringify(metResponse), '200', endsAt, logConfig));
         }
+        //PARA REPORTES
         if (req.report && req.report.type === 'pdf') {
             req.reportData = metResponse;
             pdf_1.makePdf(req, res);

package/dist/lib/pxp/Decorators.d.ts

@@ -1,7 +1,11 @@
+export declare interface ILog {
+    [field: string]: 'cc_mask' | 'complete_mask';
+}
 export declare interface IOptionsRoute {
     readOnly?: boolean;
     dbSettings?: 'Procedure' | 'Orm' | 'Query';
     authentication?: boolean;
+    log?: boolean | ILog;
 }
 declare const Get: (path?: string, options?: IOptionsRoute) => (target: any, propertyKey: string) => void;
 declare const Post: (path?: string, options?: IOptionsRoute) => (target: any, propertyKey: string) => void;

package/dist/lib/pxp/Decorators.js

@@ -16,26 +16,40 @@ exports.StoredProcedure = exports.Model = exports.ReadOnly = exports.DbSettings
  */
 const RouteDefinition_1 = require("./RouteDefinition");
 ;
-const setProperty = (target, propertyKey) => (value, name) => {
+;
+const setProperty = (target, propertyKey) => (value, name, overwrite = true) => {
     if (!Reflect.hasMetadata(name, target.constructor)) {
         Reflect.defineMetadata(name, {}, target.constructor);
     }
     const valueName = Reflect.getMetadata(name, target.constructor);
-    valueName[propertyKey] = value;
+    if (!overwrite && !valueName[propertyKey]) {
+        valueName[propertyKey] = value;
+    }
+    else if (overwrite) {
+        valueName[propertyKey] = value;
+    }
     Reflect.defineMetadata(name, valueName, target.constructor);
 };
-const createOptions = (options = {
-    readOnly: true,
-    dbSettings: 'Orm',
-    authentication: true,
-}) => (target, propertyKey) => {
-    const newProperty = setProperty(target, propertyKey);
-    // ReadOnly
-    newProperty(options.readOnly, 'readonly');
-    // DbSettings
-    newProperty(options.dbSettings, 'dbsettings');
-    // Authentication
-    newProperty(options.authentication, 'authentication');
+const createOptions = (options) => (target, propertyKey) => {
+    options = Object.assign({
+        readOnly: true,
+        dbSettings: 'Orm',
+        authentication: true,
+        log: true
+    }, options);
+    // const newProperty = setProperty(target, propertyKey);
+    // // ReadOnly
+    // newProperty(options.readOnly, 'readonly', false);
+    // // DbSettings
+    // newProperty(options.dbSettings, 'dbsettings', false);
+    // // Authentication
+    // newProperty(options.authentication, 'authentication', false);
+    if (!Reflect.hasMetadata('optionsRoute', target.constructor)) {
+        Reflect.defineMetadata('optionsRoute', {}, target.constructor);
+    }
+    const optionsRoute = Reflect.getMetadata('optionsRoute', target.constructor);
+    optionsRoute[propertyKey] = options;
+    Reflect.defineMetadata('optionsRoute', optionsRoute, target.constructor);
 };
 const setRoute = (path = '', method, options) => (target, propertyKey) => {
     if (!Reflect.hasMetadata('routes', target.constructor)) {
@@ -93,10 +107,10 @@ exports.Permission = Permission;
 const Log = (log = true, config = {}) => {
     return (target, propertyKey) => {
         if (!Reflect.hasMetadata('log', target.constructor)) {
-            Reflect.defineMetadata('log', [], target.constructor);
+            Reflect.defineMetadata('log', {}, target.constructor);
         }
         if (!Reflect.hasMetadata('logConfig', target.constructor)) {
-            Reflect.defineMetadata('logConfig', [], target.constructor);
+            Reflect.defineMetadata('logConfig', {}, target.constructor);
         }
         const logVar = Reflect.getMetadata('log', target.constructor);
         logVar[propertyKey] = log;

package/dist/lib/pxp/middlewares/isReportMiddleware.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isReportMiddleware = void 0;
 const isReportMiddleware = (req, res, next) => {
     if (req.query.report) {
-        delete req.query.start;
+        delete req.query.start; //TODO 20211011: change for spread operator instead of delete
         delete req.query.limit;
         req.report = JSON.parse(req.query.report);
         delete req.query.report;

package/dist/sockets/pxp-io-server.js

@@ -23,7 +23,9 @@ const socket_io_1 = require("socket.io");
 const mainSockets = __importStar(require("./basic-sockets"));
 class PxpIOServer {
     constructor(server, sockets) {
-        this.io = new socket_io_1.Server(server);
+        this.io = new socket_io_1.Server(server, { cors: {
+                origin: '*',
+            } });
         this.listenSockets(sockets);
     }
     listenSockets(sockets = {}) {

package/package.json

@@ -1,64 +1,65 @@
-{
-  "name": "@pxp-nd/core",
-  "version": "1.1.20",
-  "description": "Contains main files for pxp-nd",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "prepublish": "tsc",
-  "scripts": {
-    "build": "rimraf ./dist && tsc",
-    "dev:publish": "yalc publish",
-    "prod:publish": "npm publish",
-    "start": "npm run build && node dist/index.js",
-    "dev": "tsc-watch --target es2017 --outDir ./dist --onSuccess \"node .\"",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "pxp-nd"
-  ],
-  "author": "Kplian",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/adm-zip": "^0.4.34",
-    "@types/chalk": "^2.2.0",
-    "@types/cors": "^2.8.10",
-    "@types/crypto-js": "^4.0.1",
-    "@types/express": "^4.17.11",
-    "@types/express-fileupload": "^1.1.6",
-    "@types/express-session": "^1.17.3",
-    "@types/figlet": "^1.5.1",
-    "@types/joi": "^17.2.3",
-    "@types/lodash": "^4.14.170",
-    "@types/node": "^15.3.1",
-    "@types/passport": "^1.0.6",
-    "@types/socket.io": "^3.0.2",
-    "@types/swagger-jsdoc": "^6.0.1",
-    "@types/swagger-ui-express": "^4.1.3",
-    "rimraf": "^3.0.2",
-    "tsc-watch": "^4.2.9",
-    "typescript": "^4.2.4"
-  },
-  "dependencies": {
-    "adm-zip": "^0.5.5",
-    "chalk": "^1.1.3",
-    "class-validator": "^0.13.1",
-    "cors": "^2.8.5",
-    "express": "^4.17.1",
-    "express-fileupload": "^1.2.1",
-    "express-session": "^1.17.2",
-    "figlet": "^1.5.0",
-    "joi": "^17.4.1",
-    "jspdf": "^2.3.1",
-    "jspdf-autotable": "^3.5.14",
-    "lodash": "^4.17.21",
-    "moment": "^2.29.1",
-    "passport": "^0.4.1",
-    "socket.io": "^4.2.0",
-    "swagger-jsdoc": "^6.1.0",
-    "swagger-ui-express": "^4.1.6",
-    "typeorm": "^0.2.32",
-    "typeorm-store": "^2.0.0",
-    "xlsx": "^0.17.0"
-  },
-  "peerDependencies": {}
-}
+{
+  "name": "@pxp-nd/core",
+  "version": "1.2.3",
+  "description": "Contains main files for pxp-nd",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "prepublish": "tsc",
+  "scripts": {
+    "build": "rimraf ./dist && tsc",
+    "build-dev": "npm run build && npm run dev:publish",
+    "dev:publish": "yalc publish",
+    "prod:publish": "npm publish",
+    "start": "npm run build && node dist/index.js",
+    "dev": "tsc-watch --target es2017 --outDir ./dist --onSuccess \"node .\"",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "pxp-nd"
+  ],
+  "author": "Kplian",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/adm-zip": "^0.4.34",
+    "@types/chalk": "^2.2.0",
+    "@types/cors": "^2.8.10",
+    "@types/crypto-js": "^4.0.1",
+    "@types/express": "^4.17.11",
+    "@types/express-fileupload": "^1.1.6",
+    "@types/express-session": "^1.17.3",
+    "@types/figlet": "^1.5.1",
+    "@types/joi": "^17.2.3",
+    "@types/lodash": "^4.14.170",
+    "@types/node": "^15.3.1",
+    "@types/passport": "^1.0.6",
+    "@types/socket.io": "^3.0.2",
+    "@types/swagger-jsdoc": "^6.0.1",
+    "@types/swagger-ui-express": "^4.1.3",
+    "rimraf": "^3.0.2",
+    "tsc-watch": "^4.2.9",
+    "typescript": "^4.2.4"
+  },
+  "dependencies": {
+    "adm-zip": "^0.5.5",
+    "chalk": "^1.1.3",
+    "class-validator": "^0.13.1",
+    "cors": "^2.8.5",
+    "express": "^4.17.1",
+    "express-fileupload": "^1.2.1",
+    "express-session": "^1.17.2",
+    "figlet": "^1.5.0",
+    "joi": "^17.4.1",
+    "jspdf": "^2.3.1",
+    "jspdf-autotable": "^3.5.14",
+    "lodash": "^4.17.21",
+    "moment": "^2.29.1",
+    "passport": "^0.4.1",
+    "socket.io": "^4.2.0",
+    "swagger-jsdoc": "^6.1.0",
+    "swagger-ui-express": "^4.1.6",
+    "typeorm": "^0.2.32",
+    "typeorm-store": "^2.0.0",
+    "xlsx": "^0.17.0"
+  },
+  "peerDependencies": {}
+}

package/yalc.lock

@@ -1,10 +1,10 @@
-{
-  "version": "v1",
-  "packages": {
-    "@pxp-nd/auth": {
-      "signature": "c8114cdb0b6ff484731ec780c5ae951e",
-      "file": true,
-      "replaced": "^1.0.0"
-    }
-  }
+{
+  "version": "v1",
+  "packages": {
+    "@pxp-nd/auth": {
+      "signature": "c8114cdb0b6ff484731ec780c5ae951e",
+      "file": true,
+      "replaced": "^1.0.0"
+    }
+  }
 }