squarefi-bff-api-module 1.12.1 → 1.13.0

package/dist/api/issuing.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -41,12 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issuing = void 0;
+const node_rsa_1 = __importDefault(require("node-rsa"));
 const apiClientFactory_1 = require("../utils/apiClientFactory");
 const constants_1 = require("../constants");
 const fiat_accounts_1 = require("./fiat_accounts");
-const common_1 = require("../utils/common");
+const encrypt_1 = require("../utils/encrypt");
 exports.issuing = {
     cards: {
         create: {
@@ -71,28 +42,26 @@ exports.issuing = {
             encrypted: {
                 secretKey: {
                     get: (card_id) => __awaiter(void 0, void 0, void 0, function* () {
-                        const JSEncrypt = (yield Promise.resolve().then(() => __importStar(require('jsencrypt')))).default;
-                        const serverPublicKey = process.env.SERVER_PUBLIC_KEY_BASE64;
-                        const encrypt = new JSEncrypt();
-                        if (!serverPublicKey) {
+                        const serverPublicKeyEnv = process.env.SERVER_PUBLIC_KEY_BASE64;
+                        const clientRsa = new node_rsa_1.default();
+                        if (!serverPublicKeyEnv) {
                             throw new Error('SERVER_PUBLIC_KEY_BASE64 is not set');
                         }
-                        const secretKey = (0, common_1.generate256bitSecretKey)();
-                        const secretKeyBase64 = (0, common_1.arrayBufferToBase64)(secretKey);
-                        const serverPublicKeyPEM = (0, common_1.decodePEMFromBase64)(serverPublicKey);
-                        encrypt.setPublicKey(serverPublicKeyPEM);
-                        const payload = {
-                            key: secretKeyBase64,
+                        const serverPublicKey = Buffer.from(serverPublicKeyEnv, 'base64').toString('utf8');
+                        clientRsa.importKey(serverPublicKey, 'pkcs8-public-pem');
+                        const clientSecretKey = (0, encrypt_1.generateSecretKey)();
+                        const clientPayload = {
+                            key: clientSecretKey.toString('base64'),
                             timestamp: Date.now(),
                         };
-                        const encrypted_key = encrypt.encrypt(JSON.stringify(payload));
-                        const response = yield apiClientFactory_1.apiClientV1.postRequest(`/issuing/cards/${card_id}/sensitive/secretkey`, {
+                        const encrypted_key = clientRsa.encrypt(JSON.stringify(clientPayload), 'base64');
+                        const { success, encrypted, data, iv } = yield apiClientFactory_1.apiClientV1.postRequest(`/issuing/cards/${card_id}/sensitive/secretkey`, {
                             data: {
                                 encrypted_key,
                             },
                         });
-                        if (response.success && response.encrypted && response.data && response.iv) {
-                            const decryptedData = yield (0, common_1.decryptSensitiveData)(response.data, response.iv, secretKey);
+                        if (success && encrypted && data && iv) {
+                            const decryptedData = (0, encrypt_1.decryptAESData)(data, iv, clientSecretKey);
                             return decryptedData;
                         }
                     }),

package/dist/utils/encrypt.d.ts

@@ -0,0 +1,3 @@
+import { CipherKey } from 'crypto';
+export declare const generateSecretKey: () => Buffer<ArrayBufferLike>;
+export declare const decryptAESData: (encryptedData: string, iv: string, secretKey: CipherKey) => Promise<any>;

package/dist/utils/encrypt.js

@@ -0,0 +1,28 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decryptAESData = exports.generateSecretKey = void 0;
+const crypto_1 = __importDefault(require("crypto"));
+const generateSecretKey = () => {
+    const secretKey = crypto_1.default.randomBytes(32);
+    return secretKey;
+};
+exports.generateSecretKey = generateSecretKey;
+const decryptAESData = (encryptedData, iv, secretKey) => __awaiter(void 0, void 0, void 0, function* () {
+    const decipher = crypto_1.default.createDecipheriv('aes-256-cbc', secretKey, Buffer.from(iv, 'base64'));
+    let decrypted = decipher.update(encryptedData, 'base64', 'utf8');
+    decrypted += decipher.final('utf8');
+    return JSON.parse(decrypted);
+});
+exports.decryptAESData = decryptAESData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squarefi-bff-api-module",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "description": "Squarefi BFF API client module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,11 +20,12 @@
   "dependencies": {
     "@telegram-apps/sdk-react": "^3.1.2",
     "axios": "^1.6.7",
-    "jsencrypt": "^3.3.2"
+    "node-rsa": "^1.1.1"
   },
   "devDependencies": {
     "@types/jest": "^29.x.x",
     "@types/node": "^20.x.x",
+    "@types/node-rsa": "^1.1.4",
     "jest": "^29.x.x",
     "ts-jest": "^29.x.x",
     "typescript": "^5.x.x"

package/src/api/issuing.ts

@@ -1,15 +1,11 @@
 import { API } from './types';
+import NodeRSA from 'node-rsa';
 
 import { apiClientV1 } from '../utils/apiClientFactory';
 
-import { defaultPaginationParams, SubAccountType } from '../constants';
+import { defaultPaginationParams } from '../constants';
 import { fiat_accounts } from './fiat_accounts';
-import {
-  arrayBufferToBase64,
-  decodePEMFromBase64,
-  decryptSensitiveData,
-  generate256bitSecretKey,
-} from '../utils/common';
+import { decryptAESData, generateSecretKey } from '../utils/encrypt';
 
 export const issuing = {
   cards: {
@@ -40,27 +36,25 @@ export const issuing = {
       encrypted: {
         secretKey: {
           get: async (card_id: string) => {
-            const JSEncrypt = (await import('jsencrypt')).default;
-            const serverPublicKey = process.env.SERVER_PUBLIC_KEY_BASE64;
-            const encrypt = new JSEncrypt();
+            const serverPublicKeyEnv = process.env.SERVER_PUBLIC_KEY_BASE64;
+            const clientRsa = new NodeRSA();
 
-            if (!serverPublicKey) {
+            if (!serverPublicKeyEnv) {
               throw new Error('SERVER_PUBLIC_KEY_BASE64 is not set');
             }
 
-            const secretKey = generate256bitSecretKey();
-            const secretKeyBase64 = arrayBufferToBase64(secretKey);
-            const serverPublicKeyPEM = decodePEMFromBase64(serverPublicKey);
-            encrypt.setPublicKey(serverPublicKeyPEM);
+            const serverPublicKey = Buffer.from(serverPublicKeyEnv, 'base64').toString('utf8');
+            clientRsa.importKey(serverPublicKey, 'pkcs8-public-pem');
 
-            const payload = {
-              key: secretKeyBase64,
+            const clientSecretKey = generateSecretKey();
+            const clientPayload = {
+              key: clientSecretKey.toString('base64'),
               timestamp: Date.now(),
             };
 
-            const encrypted_key = encrypt.encrypt(JSON.stringify(payload));
+            const encrypted_key = clientRsa.encrypt(JSON.stringify(clientPayload), 'base64');
 
-            const response = await apiClientV1.postRequest<API.Cards.SensitiveDataEncrypted>(
+            const { success, encrypted, data, iv } = await apiClientV1.postRequest<API.Cards.SensitiveDataEncrypted>(
               `/issuing/cards/${card_id}/sensitive/secretkey`,
               {
                 data: {
@@ -68,8 +62,9 @@ export const issuing = {
                 },
               }
             );
-            if (response.success && response.encrypted && response.data && response.iv) {
-              const decryptedData = await decryptSensitiveData(response.data, response.iv, secretKey);
+
+            if (success && encrypted && data && iv) {
+              const decryptedData = decryptAESData(data, iv, clientSecretKey);
 
               return decryptedData;
             }

package/src/utils/encrypt.ts

@@ -0,0 +1,13 @@
+import crypto, { CipherKey } from 'crypto';
+
+export const generateSecretKey = () => {
+  const secretKey = crypto.randomBytes(32);
+  return secretKey;
+};
+
+export const decryptAESData = async (encryptedData: string, iv: string, secretKey: CipherKey) => {
+  const decipher = crypto.createDecipheriv('aes-256-cbc', secretKey, Buffer.from(iv, 'base64'));
+  let decrypted = decipher.update(encryptedData, 'base64', 'utf8');
+  decrypted += decipher.final('utf8');
+  return JSON.parse(decrypted);
+};

package/src/utils/common.ts

@@ -1,42 +0,0 @@
-export const generate256bitSecretKey = () => {
-  const array = new Uint8Array(32);
-  window.crypto.getRandomValues(array);
-  return array;
-};
-
-export const arrayBufferToBase64 = (buffer: Uint8Array<ArrayBuffer>) => {
-  return btoa(String.fromCharCode.apply(null, new Uint8Array(buffer) as any));
-};
-
-export const decodePEMFromBase64 = (base64EncodedPEM: string) => {
-  return atob(base64EncodedPEM);
-};
-
-export const base64ToArrayBuffer = (base64: string) => {
-  const binaryString = atob(base64);
-  const bytes = new Uint8Array(binaryString.length);
-  for (let i = 0; i < binaryString.length; i++) {
-    bytes[i] = binaryString.charCodeAt(i);
-  }
-  return bytes.buffer;
-};
-
-export const decryptSensitiveData = async (encryptedData: string, iv: string, secretKey: BufferSource) => {
-  const key = await window.crypto.subtle.importKey('raw', secretKey, { name: 'AES-CBC' }, false, ['decrypt']);
-
-  const encryptedBuffer = base64ToArrayBuffer(encryptedData);
-  const ivBuffer = base64ToArrayBuffer(iv);
-
-  const decryptedBuffer = await window.crypto.subtle.decrypt(
-    {
-      name: 'AES-CBC',
-      iv: ivBuffer,
-    },
-    key,
-    encryptedBuffer
-  );
-
-  const decoder = new TextDecoder();
-  const jsonText = decoder.decode(decryptedBuffer);
-  return JSON.parse(jsonText);
-};