@bigid/apps-infrastructure-node-js 1.180.1 → 1.181.1

package/lib/services/dataSourceService.js

@@ -13,13 +13,22 @@ exports.fetchDataSourceCredentials = void 0;
 const encryptionService_1 = require("./encryptionService");
 const bigidProxyService_1 = require("./bigidProxyService");
 const fetchDataSourceCredentials = (executionContext, dataSourceName) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const res = yield (0, bigidProxyService_1.executeHttpGet)(executionContext, '/tpa/' + executionContext.tpaId + '/credentials/' + dataSourceName.replace(' ', '%20'));
     const resData = res.data;
-    return Object.keys(resData).reduce((acc, key) => {
+    const encryptionKey = resData.random
+        ? (_b = (_a = (yield (0, bigidProxyService_1.executeHttpGet)(executionContext, '/tpa/encryption-key/' + resData.random))) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.key
+        : null;
+    const credsObject = resData.random ? resData.credentials : resData;
+    return Object.keys(credsObject).reduce((acc, key) => {
         var _a;
-        const credentialObject = resData[key];
+        const credentialObject = credsObject[key];
         const credentialValue = (_a = credentialObject.value) === null || _a === void 0 ? void 0 : _a.toString();
-        acc[key] = credentialObject.encrypted ? (0, encryptionService_1.decrypt)(credentialValue) : credentialValue;
+        acc[key] = credentialObject.encrypted
+            ? encryptionKey
+                ? (0, encryptionService_1.decryptWithKey)(credentialValue, encryptionKey)
+                : (0, encryptionService_1.decrypt)(credentialValue)
+            : credentialValue;
         return acc;
     }, {});
 });

package/lib/services/encryptionService.d.ts

@@ -1 +1,2 @@
 export declare const decrypt: (encryptedText: string) => string;
+export declare const decryptWithKey: (encryptedText: string, encryptionKey: string) => string;

package/lib/services/encryptionService.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decrypt = void 0;
+exports.decryptWithKey = exports.decrypt = void 0;
 const crypto = __importStar(require("crypto"));
 var Defaults;
 (function (Defaults) {
@@ -36,18 +36,21 @@ var Defaults;
     Defaults["SECRET_KEY"] = "SECRET_KEY";
 })(Defaults || (Defaults = {}));
 const decrypt = (encryptedText) => {
+    var _a;
+    return (0, exports.decryptWithKey)(encryptedText, (_a = process.env.APPLICATION_CREDENTIALS_KEY) !== null && _a !== void 0 ? _a : '');
+};
+exports.decrypt = decrypt;
+const decryptWithKey = (encryptedText, encryptionKey) => {
     const ivAndText = getAndUseOldIvOrNew(encryptedText);
-    const decipher = crypto.createDecipheriv(Defaults.AES_ALGORITHM, makeKey(), ivAndText.iv);
+    const decipher = crypto.createDecipheriv(Defaults.AES_ALGORITHM, makeKey(encryptionKey), ivAndText.iv);
     let decryptedData = decipher.update(ivAndText.cleanText, Defaults.BASE64_ENC, Defaults.UTF8_ENC);
     decryptedData += decipher.final(Defaults.UTF8_ENC);
     return decryptedData;
 };
-exports.decrypt = decrypt;
-const makeKey = () => {
-    var _a;
+exports.decryptWithKey = decryptWithKey;
+const makeKey = (secretKey) => {
     const md = crypto.createHash(Defaults.SHA_ALGORITHM);
     try {
-        const secretKey = (_a = process.env.APPLICATION_CREDENTIALS_KEY) !== null && _a !== void 0 ? _a : '';
         const key = md.update(secretKey).digest();
         return key;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigid/apps-infrastructure-node-js",
-  "version": "1.180.1",
+  "version": "1.181.1",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/services/dataSourceService.ts

@@ -1,4 +1,4 @@
-import { decrypt } from './encryptionService';
+import { decrypt, decryptWithKey } from './encryptionService';
 import { ExecutionContext } from '../dto';
 import { executeHttpGet } from './bigidProxyService';
 
@@ -11,10 +11,18 @@ export const fetchDataSourceCredentials = async (
     '/tpa/' + executionContext.tpaId + '/credentials/' + dataSourceName.replace(' ', '%20'),
   );
   const resData = res.data;
-  return Object.keys(resData).reduce((acc: { [key: string]: string }, key) => {
-    const credentialObject = resData[key];
+  const encryptionKey = resData.random
+    ? (await executeHttpGet(executionContext, '/tpa/encryption-key/' + resData.random))?.data?.key
+    : null;
+  const credsObject = resData.random ? resData.credentials : resData;
+  return Object.keys(credsObject).reduce((acc: { [key: string]: string }, key) => {
+    const credentialObject = credsObject[key];
     const credentialValue = credentialObject.value?.toString();
-    acc[key] = credentialObject.encrypted ? decrypt(credentialValue) : credentialValue;
+    acc[key] = credentialObject.encrypted
+      ? encryptionKey
+        ? decryptWithKey(credentialValue, encryptionKey)
+        : decrypt(credentialValue)
+      : credentialValue;
     return acc;
   }, {});
 };

package/src/services/encryptionService.ts

@@ -13,17 +13,20 @@ enum Defaults {
 }
 
 export const decrypt = (encryptedText: string): string => {
+  return decryptWithKey(encryptedText, process.env.APPLICATION_CREDENTIALS_KEY ?? '');
+};
+
+export const decryptWithKey = (encryptedText: string, encryptionKey: string): string => {
   const ivAndText = getAndUseOldIvOrNew(encryptedText);
-  const decipher = crypto.createDecipheriv(Defaults.AES_ALGORITHM, makeKey(), ivAndText.iv);
+  const decipher = crypto.createDecipheriv(Defaults.AES_ALGORITHM, makeKey(encryptionKey), ivAndText.iv);
   let decryptedData = decipher.update(ivAndText.cleanText as string, Defaults.BASE64_ENC, Defaults.UTF8_ENC);
   decryptedData += decipher.final(Defaults.UTF8_ENC);
   return decryptedData;
 };
 
-const makeKey = (): Buffer => {
+const makeKey = (secretKey: string): Buffer => {
   const md = crypto.createHash(Defaults.SHA_ALGORITHM);
   try {
-    const secretKey = process.env.APPLICATION_CREDENTIALS_KEY ?? '';
     const key = md.update(secretKey).digest();
     return key;
   } catch (error) {