Making toDecrypt and toEncrypt optional params

lib/mcapi/encryption/field-level-encryption.js

@@ -51,6 +51,7 @@ function encrypt(endpoint, header, body) {
   let bodyMap = body;
   const fleConfig = utils.hasConfig(this.config, endpoint);
   if (fleConfig) {
+    if (!fleConfig.toEncrypt) return { header: header, body: body };
     if (!this.isWithHeader) {
       bodyMap = fleConfig.toEncrypt.map((v) => {
         return encryptBody.call(this, v, body);
@@ -81,6 +82,7 @@ function decrypt(response) {
   let bodyMap = response.body;
   const fleConfig = utils.hasConfig(this.config, response.request.url);
   if (fleConfig) {
+    if (!fleConfig.toDecrypt) return body;
     bodyMap = fleConfig.toDecrypt.map((v) => {
       if (!this.isWithHeader) {
         return decryptBody.call(this, v, body);

lib/mcapi/encryption/jwe-encryption.js

@@ -27,6 +27,7 @@ function encrypt(endpoint, header, body) {
   let bodyMap = body;
   const fleConfig = utils.hasConfig(this.config, endpoint);
   if (fleConfig) {
+    if (!fleConfig.toEncrypt) return { header: header, body: body };
     bodyMap = fleConfig.toEncrypt.map((v) => {
       return encryptBody.call(this, v, body);
     });
@@ -49,7 +50,8 @@ function decrypt(response) {
   let bodyMap = response.body;
   const fleConfig = utils.hasConfig(this.config, response.request.url);
   if (fleConfig) {
-    bodyMap = fleConfig.toDecrypt.map((v) => {
+    if (!fleConfig.toDecrypt) return body;
+    bodyMap = (fleConfig.toDecrypt).map((v) => {
       return decryptBody.call(this, v, body);
     });
   }

lib/mcapi/utils/utils.js

@@ -81,7 +81,7 @@
     } else {
       return JSON.stringify(data);
     }
   } catch (e) {
     throw new Error("Json not valid"); // eslint-disable-line preserve-caught-error
   }
 };
@@ -103,7 +103,7 @@
   }
   try {
     return JSON.parse(data);
   } catch (e) {
     return data.valueOf();
   }
 };
@@ -111,7 +111,7 @@
 function isJson(str) {
   try {
     JSON.parse(str);
   } catch (e) {
     return false;
   }
   return true;
@@ -372,7 +372,7 @@
   }
 
   config.paths.forEach((path) => {
-    if (multipleRoots(path.toEncrypt) || multipleRoots(path.toDecrypt)) {
+    if (multipleRoots(path.toEncrypt || []) || multipleRoots(path.toDecrypt || [])) {
       throw Error(
         "Config not valid: found multiple configurations encrypt/decrypt with root mapping"
       );
@@ -406,7 +406,7 @@
       node: obj,
       parent: parent,
     };
   } catch (e) {
     return null;
   }
 };

test/field-level-encryption.test.js

@@ -46,6 +46,16 @@ describe("Field Level Encryption", () => {
       assert.ok(!res.body.elem1.encryptedData.accountNumber);
     });
 
+    it("returns body untouched when toEncrypt is not defined", () => {
+      const config = JSON.parse(JSON.stringify(testConfig));
+      delete config.paths[0].toEncrypt;
+      const fle = new FieldLevelEncryption(config);
+      const body = { elem1: { encryptedData: { accountNumber: "5123456789012345" } } };
+      const res = encrypt.call(fle, "/resource", null, body);
+      assert.ok(res.header === null);
+      assert.ok(res.body === body);
+    });
+
     it("encrypt body payload with readme config", () => {
       const testConfigReadme = require("./mock/config-readme");
       const fle = new FieldLevelEncryption(testConfigReadme);
@@ -197,6 +207,15 @@ describe("Field Level Encryption", () => {
       assert.ok(res === response.body);
     });
 
+    it("returns body untouched when toDecrypt is not defined", () => {
+      const config = JSON.parse(JSON.stringify(testConfig));
+      delete config.paths[0].toDecrypt;
+      const fle = new FieldLevelEncryption(config);
+      const response = JSON.parse(JSON.stringify(require("./mock/response")));
+      const res = decrypt.call(fle, response);
+      assert.ok(res === response.body);
+    });
+
     it("decrypt response replacing whole body", () => {
       const config = JSON.parse(JSON.stringify(testConfig));
       config.paths[0].toDecrypt[0].element = "";

test/jwe-encryption.test.js

@@ -38,6 +38,19 @@ describe("JWE Encryption", () => {
     });
   });
 
+  describe("#encrypt without toEncrypt", () => {
+    it("returns body untouched", () => {
+      const config = JSON.parse(JSON.stringify(testConfig));
+      delete config.paths[0].toEncrypt;
+      const encryption = new JweEncryption(config);
+      const encrypt = JweEncryption.__get__("encrypt");
+      const body = { elem1: { encryptedData: { accountNumber: "5123456789012345" } } };
+      const res = encrypt.call(encryption, "/resource", null, body);
+      assert.ok(res.header === null);
+      assert.ok(res.body === body);
+    });
+  });
+
   describe("#decrypt", () => {
     it("decrypt response", () => {
       const encryption = new JweEncryption(testConfig);
@@ -51,6 +64,16 @@ describe("JWE Encryption", () => {
       );
     });
 
+    it("returns body untouched when toDecrypt is not defined", () => {
+      const config = JSON.parse(JSON.stringify(testConfig));
+      delete config.paths[0].toDecrypt;
+      const encryption = new JweEncryption(config);
+      const decrypt = JweEncryption.__get__("decrypt");
+      const response = JSON.parse(JSON.stringify(require("./mock/jwe-response")));
+      const res = decrypt.call(encryption, response);
+      assert.ok(res === response.body);
+    });
+
     it("decrypt first level element in response", () => {
       const encryption = new JweEncryption(testConfig);
       const decrypt = JweEncryption.__get__("decrypt");