@pxp-nd/core 1.2.81 → 1.2.83

package/dist/interfaces.d.ts

@@ -48,5 +48,6 @@ export interface IConfigPxpApp {
     enableSocket?: boolean;
     expressJsonConfig?: IConfigExpress;
     expressUrlEncodedConfig?: IConfigExpress;
+    permissionFunction?: boolean | ((user: any, transaction: string) => Promise<boolean>);
 }
 export {};

package/dist/lib/pxp/Controller.js

@@ -219,7 +219,7 @@ class Controller {
             }
         });
     }
-    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = true, log = true, logConfig = {}, isHtml, isFile) {
+    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = false, log = true, logConfig = {}, isHtml, isFile) {
         if (dbsettings === 'Orm') {
             await index_1.__(this.ormMethodWrapper(params, req, next, res, methodName, readonly, permission, log, logConfig, isHtml, isFile));
         }
@@ -230,11 +230,11 @@ class Controller {
             await this.sqlMethodWrapper(params, next, res, methodName, readonly, permission, log, logConfig);
         }
     }
-    async ormMethodWrapper(params, req, next, res, methodName, readonly, permission = true, log = true, logConfig = {}, isHtml = false, isFile = false) {
+    async ormMethodWrapper(params, req, next, res, methodName, readonly, permission = false, log = true, logConfig = {}, isHtml = false, isFile = false) {
         let metResponse;
         if (permission) {
-            if (this.user && this.user.roles && this.user.roles.length === 0) {
-                const hasPermission = await index_1.__(index_1.userHasPermission(this.config.entities.Role)(this.user.userId, this.transactionCode));
+            if (this.user) {
+                const hasPermission = await index_1.__(index_1.userHasPermission(this.user, this.transactionCode, this.config.permissionFunction));
                 if (!hasPermission) {
                     throw new index_1.PxpError(403, 'Access denied to execute this method');
                 }

package/dist/lib/pxp/Decorators.js

@@ -108,7 +108,7 @@ const IsFile = (isFile = false) => (target, propertyKey) => setProperty(target,
 exports.IsFile = IsFile;
 const DbSettings = (modelType) => (target, propertyKey) => setProperty(target, propertyKey)(modelType, 'dbsettings');
 exports.DbSettings = DbSettings;
-const Permission = (permission = true) => (target, propertyKey) => setProperty(target, propertyKey)(permission, 'permission');
+const Permission = (permission = false) => (target, propertyKey) => setProperty(target, propertyKey)(permission, 'permission');
 exports.Permission = Permission;
 const Log = (log = true, config = {}) => {
     return (target, propertyKey) => {

package/dist/lib/pxp/utils/Security.d.ts

@@ -17,7 +17,7 @@ interface ScriptInterface {
     scriptCode: string;
     scriptFunction: (manager: EntityManager) => void;
 }
-declare const userHasPermission: (Role: any) => (userId: number, transaction: string) => Promise<boolean>;
+declare const userHasPermission: (user: any, transaction: string, permissionFunction: boolean | ((user: any, transaction: string) => Promise<boolean>)) => Promise<boolean>;
 declare const insertLog: (username: string, macaddres: string, ip: string, logType: string, desc: string, proc: string, trans: string, query: string, req: Record<string, unknown>, resp: string, err: string, timeEx: number, logConfig: Record<string, unknown>) => Promise<number>;
 export { userHasPermission, insertLog };
 export type { ScriptInterface };

package/dist/lib/pxp/utils/Security.js

@@ -21,18 +21,25 @@ require("reflect-metadata");
 const typeorm_1 = require("typeorm");
 // import { Role } from '@pxp-nd/entities';
 const Log_1 = __importDefault(require("../../../entities/Log"));
-const userHasPermission = (Role) => async (userId, transaction) => {
-    const user = await typeorm_1.getManager()
+const userHasPermission = async (user, transaction, permissionFunction) => {
+    if (typeof permissionFunction === 'function') {
+        return await permissionFunction(user, transaction);
+    }
+    else {
+        /*const userRes = await getManager()
         .createQueryBuilder(Role, 'role')
         .innerJoinAndSelect('role.uis', 'ui')
         .innerJoin('role.users', 'user')
         .innerJoin('ui.transactions', 'uiTran')
         .innerJoin('uiTran.transaction', 'transac')
         .select('COUNT(*) AS count')
-        .where('"user".user_id = :userId', { userId })
+        .where('"user".user_id = :userId', { userId: user.userId })
         .andWhere('transac.code= :codeTrans', { codeTrans: transaction })
         .getRawOne();
-    return user.count === '0' ? false : true;
+   
+        return userRes.count === '0' ? false : true;*/
+        return true;
+    }
 };
 exports.userHasPermission = userHasPermission;
 const insertLog = async (username, macaddres, ip, logType, desc, proc, trans, query, req, resp, err, timeEx, logConfig) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/core",
-  "version": "1.2.81",
+  "version": "1.2.83",
   "description": "Contains main files for pxp-nd",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",