Merge branch 'main' into feature/removing-sonar-issues-pt2

# Conflicts:
#	lib/mcapi/crypto/jwe-crypto.js
#	lib/mcapi/encryption/field-level-encryption.js
#	lib/mcapi/encryption/jwe-encryption.js
#	lib/mcapi/utils/utils.js

Author: rossphelan

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mastercard-client-encryption",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Library for Mastercard API compliant payload encryption/decryption.",
   "main": "index.js",
   "engines": {

package.json

@@ -22,50 +22,6 @@ describe("Field Level Encryption", () => {
     });
   });
 
-  describe("#hasConfig", () => {
-    const hasConfig = FieldLevelEncryption.__get__("hasConfig");
-
-    it("when valid config, not found endpoint", () => {
-      const ret = hasConfig(testConfig, "/endpoint");
-      assert.ok(ret === null);
-    });
-
-    it("when valid config, found endpoint", () => {
-      const ret = hasConfig(testConfig, "/resource");
-      assert.ok(ret);
-    });
-
-    it("when config is null", () => {
-      const ret = hasConfig(null, "/resource");
-      assert.ok(ret == null);
-    });
-
-    it("when path has wildcard", () => {
-      const ret = hasConfig(
-        testConfig,
-        "https://api.example.com/mappings/0123456"
-      );
-      assert.ok(ret.toEncrypt[0].element === "elem2.encryptedData");
-      assert.ok(ret);
-    });
-  });
-
-  describe("#elemFromPath", () => {
-    const elemFromPath = FieldLevelEncryption.__get__("elemFromPath");
-
-    it("valid path", () => {
-      const res = elemFromPath("elem1.elem2", { elem1: { elem2: "test" } });
-      assert.ok(res.node === "test");
-      assert.ok(
-        JSON.stringify(res.parent) === JSON.stringify({ elem2: "test" })
-      );
-    });
-
-    it("not valid path", () => {
-      const res = elemFromPath("elem1.elem2", { elem2: "test" });
-      assert.ok(!res);
-    });
-  });
 
   describe("#encrypt", () => {
     const fle = new FieldLevelEncryption(testConfig);

test/field-level-encryption.test.js

@@ -19,51 +19,6 @@ describe("JWE Encryption", () => {
     });
   });
 
-  describe("#hasConfig", () => {
-    const hasConfig = JweEncryption.__get__("hasConfig");
-
-    it("when valid config, not found endpoint", () => {
-      const ret = hasConfig(testConfig, "/endpoint");
-      assert.ok(ret === null);
-    });
-
-    it("when valid config, found endpoint", () => {
-      const ret = hasConfig(testConfig, "/resource");
-      assert.ok(ret);
-    });
-
-    it("when config is null", () => {
-      const ret = hasConfig(null, "/resource");
-      assert.ok(ret == null);
-    });
-
-    it("when path has wildcard", () => {
-      const ret = hasConfig(
-        testConfig,
-        "https://api.example.com/mappings/0123456"
-      );
-      assert.ok(ret.toEncrypt[0].element === "elem2.encryptedData");
-      assert.ok(ret);
-    });
-  });
-
-  describe("#elemFromPath", () => {
-    const elemFromPath = JweEncryption.__get__("elemFromPath");
-
-    it("valid path", () => {
-      const res = elemFromPath("elem1.elem2", { elem1: { elem2: "test" } });
-      assert.ok(res.node === "test");
-      assert.ok(
-        JSON.stringify(res.parent) === JSON.stringify({ elem2: "test" })
-      );
-    });
-
-    it("not valid path", () => {
-      const res = elemFromPath("elem1.elem2", { elem2: "test" });
-      assert.ok(!res);
-    });
-  });
-
   describe("#encrypt", () => {
     it("encrypt body payload", () => {
       const encryption = new JweEncryption(testConfig);

test/jwe-encryption.test.js

@@ -1,5 +1,6 @@
 const assert = require("assert");
 const utils = require("../lib/mcapi/utils/utils");
+const testConfig = require("./mock/config");
 
 describe("Utils", () => {
   describe("#isSet", () => {
@@ -411,4 +412,47 @@ describe("Utils", () => {
       }, /Public certificate content is not valid/);
     });
   });
+
+  describe("#utils.hasConfig", () => {
+
+    it("when valid config, not found endpoint", () => {
+      const ret = utils.hasConfig(testConfig, "/endpoint");
+      assert.ok(ret === null);
+    });
+
+    it("when valid config, found endpoint", () => {
+      const ret = utils.hasConfig(testConfig, "/resource");
+      assert.ok(ret);
+    });
+
+    it("when config is null", () => {
+      const ret = utils.hasConfig(null, "/resource");
+      assert.ok(ret == null);
+    });
+
+    it("when path has wildcard", () => {
+      const ret = utils.hasConfig(
+        testConfig,
+        "https://api.example.com/mappings/0123456"
+      );
+      assert.ok(ret.toEncrypt[0].element === "elem2.encryptedData");
+      assert.ok(ret);
+    });
+  });
+
+  describe("#utils.elemFromPath", () => {
+    it("valid path", () => {
+      const res = utils.elemFromPath("elem1.elem2", { elem1: { elem2: "test" } });
+      assert.ok(res.node === "test");
+      assert.ok(
+        JSON.stringify(res.parent) === JSON.stringify({ elem2: "test" })
+      );
+    });
+
+    it("not valid path", () => {
+      const res = utils.elemFromPath("elem1.elem2", { elem2: "test" });
+      assert.ok(!res);
+    });
+  });
+
 });