More refactoring

Author: rossphelan

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

@@ -65,7 +65,7 @@ function encrypt(endpoint, header, body) {
   }
   return {
     header: header,
-    body: fleConfig ? computeBody(fleConfig.toEncrypt, body, bodyMap) : body,
+    body: fleConfig ? utils.computeBody(fleConfig.toEncrypt, body, bodyMap) : body,
   };
 }
 
@@ -89,7 +89,7 @@ function decrypt(response) {
       }
     });
   }
-  return fleConfig ? computeBody(fleConfig.toDecrypt, body, bodyMap) : body;
+  return fleConfig ? utils.computeBody(fleConfig.toDecrypt, body, bodyMap) : body;
 }
 
 /**
@@ -191,12 +191,4 @@ function decryptWithHeader(path, body, response) {
   }
 }
 
-function computeBody(configParam, body, bodyMap) {
-  return hasEncryptionParam(configParam, bodyMap) ? bodyMap.pop() : body;
-}
-
-function hasEncryptionParam(encParams, bodyMap) {
-  return encParams && encParams.length === 1 && bodyMap && bodyMap[0];
-}
-
 module.exports = FieldLevelEncryption;

lib/mcapi/encryption/jwe-encryption.js

@@ -53,7 +53,7 @@ function decrypt(response) {
       return decryptBody.call(this, v, body);
     });
   }
-  return fleConfig ? computeBody(fleConfig.toDecrypt, body, bodyMap) : body;
+  return fleConfig ? utils.computeBody(fleConfig.toDecrypt, body, bodyMap) : body;
 }
 
 /**
@@ -104,12 +104,4 @@ function decryptBody(path, body) {
   return body;
 }
 
-function computeBody(configParam, body, bodyMap) {
-  return hasEncryptionParam(configParam, bodyMap) ? bodyMap.pop() : body;
-}
-
-function hasEncryptionParam(encParams, bodyMap) {
-  return encParams && encParams.length === 1 && bodyMap && bodyMap[0];
-}
-
 module.exports = JweEncryption;

lib/mcapi/utils/utils.js

@@ -380,7 +380,7 @@ module.exports.hasConfig = function(config, endpoint) {
   return null;
 };
 
-module.exports.elemFromPath = function(path, obj) {
+module.exports.elemFromPath = function (path, obj) {
   try {
     let parent = null;
     const paths = path.split(".");
@@ -405,6 +405,15 @@ module.exports.isJsonRoot = function(elem) {
 
 function isJsonRoot(elem){
   return elem === "$";
+}
+
+module.exports.computeBody = function (configParam, body, bodyMap) {
+  return hasEncryptionParam(configParam, bodyMap) ? bodyMap.pop() : body;
 };
 
+function hasEncryptionParam(encParams, bodyMap) {
+  return encParams && encParams.length === 1 && bodyMap && bodyMap[0];
+}
+
+