ismx-nexo-node-app 0.4.117 → 0.4.119

package/dist/js/business/utils/CryptoUtils.js

@@ -37,7 +37,7 @@ class CryptoUtils {
         const pad = Buffer.alloc((blocksize - (buf.length % blocksize)) % blocksize, 0);
         return Buffer.concat([buf, pad]);
     }
-    static encrypt3DES(key, message) {
+    static symEncrypt(key, message) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             let crypto = (_a = this.crypto) !== null && _a !== void 0 ? _a : (yield Promise.resolve().then(() => __importStar(require("crypto")))).default;
@@ -54,11 +54,27 @@ class CryptoUtils {
             return encryptedBuf.slice(0, maxLength);
         });
     }
+    static symDecrypt(key, encrypted) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let crypto = (_a = this.crypto) !== null && _a !== void 0 ? _a : (yield Promise.resolve().then(() => __importStar(require("crypto")))).default;
+            const keyBuf = Buffer.from(key, 'base64');
+            const iv = Buffer.alloc(8, 0);
+            const decipher = crypto.createDecipheriv('des-ede3-cbc', keyBuf, iv);
+            decipher.setAutoPadding(false);
+            const decryptedBuf = Buffer.concat([
+                decipher.update(encrypted),
+                decipher.final()
+            ]);
+            // Remove zero padding
+            return decryptedBuf.toString('utf8').replace(/\x00+$/g, '');
+        });
+    }
     static sha256Sign(merchantKey, orderId, encodedOrder) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             let crypto = (_a = this.crypto) !== null && _a !== void 0 ? _a : (yield Promise.resolve().then(() => __importStar(require("crypto")))).default;
-            const orderKeyBuf = yield CryptoUtils.encrypt3DES(merchantKey, orderId);
+            const orderKeyBuf = yield CryptoUtils.symEncrypt(merchantKey, orderId);
             return crypto.createHmac('sha256', orderKeyBuf).update(encodedOrder).digest('base64');
         });
     }

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -237,7 +237,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, arguments, void 0, function* (name, params = [], filters = {}) {
             var _a;
             let { where, values } = this.anyWhere(filters);
-            let placeholders = (_a = params === null || params === void 0 ? void 0 : params.map((_, index) => "$" + (index + 1 + where.length))) !== null && _a !== void 0 ? _a : [];
+            let placeholders = (_a = params === null || params === void 0 ? void 0 : params.map((_, index) => "$" + (index + 1 + values.length))) !== null && _a !== void 0 ? _a : [];
             let query = `SELECT ${name}(${placeholders.join(',')}) WHERE ${where}`;
             return this.query(query, [...values, ...params]);
         });

package/dist/types/business/utils/CryptoUtils.d.ts

@@ -1,6 +1,7 @@
 export default abstract class CryptoUtils {
     private static crypto;
     static zeroPad(buf: Buffer, blocksize: number): Buffer;
-    static encrypt3DES(key: string, message: string): Promise<Buffer>;
+    static symEncrypt(key: string, message: string): Promise<Buffer>;
+    static symDecrypt(key: string, encrypted: Buffer): Promise<string>;
     static sha256Sign(merchantKey: string, orderId: string, encodedOrder: string): Promise<string>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.117",
+  "version": "0.4.119",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/business/utils/CryptoUtils.ts

@@ -7,7 +7,7 @@ export default abstract class CryptoUtils {
 		return Buffer.concat([buf, pad]);
 	}
 
-	static async encrypt3DES(key: string, message: string)
+	static async symEncrypt(key: string, message: string): Promise<Buffer>
 	{
 		let crypto = this.crypto ?? (await import("crypto")).default;
 
@@ -27,9 +27,27 @@ export default abstract class CryptoUtils {
 		return encryptedBuf.slice(0, maxLength);
 	}
 
+    static async symDecrypt(key: string, encrypted: Buffer): Promise<string> {
+        let crypto = this.crypto ?? (await import("crypto")).default;
+
+        const keyBuf = Buffer.from(key, 'base64');
+        const iv = Buffer.alloc(8, 0);
+
+        const decipher = crypto.createDecipheriv('des-ede3-cbc', keyBuf, iv);
+        decipher.setAutoPadding(false);
+
+        const decryptedBuf = Buffer.concat([
+            decipher.update(encrypted),
+            decipher.final()
+        ]);
+
+        // Remove zero padding
+        return decryptedBuf.toString('utf8').replace(/\x00+$/g, '');
+    }
+
 	static async sha256Sign(merchantKey: string, orderId: string, encodedOrder: string) {
 		let crypto = this.crypto ?? (await import("crypto")).default;
-		const orderKeyBuf = await CryptoUtils.encrypt3DES(merchantKey, orderId);
+		const orderKeyBuf = await CryptoUtils.symEncrypt(merchantKey, orderId);
 		return crypto.createHmac('sha256', orderKeyBuf).update(encodedOrder).digest('base64');
 	}
 }

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -207,7 +207,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     async run<T>(name: string, params: Valuable[] = [], filters: Partial<T> = {}): Promise<T[]>
     {
         let { where, values } = this.anyWhere(filters as any);
-        let placeholders = params?.map((_, index) => "$"+(index+1+where.length)) ?? [];
+        let placeholders = params?.map((_, index) => "$"+(index+1+values.length)) ?? [];
         let query = `SELECT ${name}(${placeholders.join(',')}) WHERE ${where}`;
         return this.query<any>(query, [ ...values, ...params ])
     }