Merge pull request #16 from Mastercard/feature/code-cleanup

Code cleanup

Author: ech0s7r

lib/mcapi/crypto/crypto.js

@@ -49,7 +49,7 @@ function Crypto(config) {
    * @param encryptionParams encryption parameters
    */
   this.encryptData = function (options, encryptionParams) {
-    let data = utils.jsonToString(options.data);
+    const data = utils.jsonToString(options.data);
 
     // Generate encryption params
     const enc = encryptionParams || this.newEncryptionParams(options);
@@ -173,7 +173,7 @@ function generateSecretKey(algorithm, size, digest) {
  * @private
  */
 function loadPrivateKey(privateKeyPath) {
-  let privateKeyContent = fs.readFileSync(privateKeyPath, 'binary');
+  const privateKeyContent = fs.readFileSync(privateKeyPath, 'binary');
 
   if (!privateKeyContent || privateKeyContent.length <= 1) {
     throw new Error('Private key content not valid');
@@ -186,7 +186,7 @@ function loadPrivateKey(privateKeyPath) {
  * @private
  */
 function readPublicCertificate(publicCertificatePath) {
-  let certificateContent = fs.readFileSync(publicCertificatePath);
+  const certificateContent = fs.readFileSync(publicCertificatePath);
   if (!certificateContent || certificateContent.length <= 1) {
     throw new Error('Public certificate content is not valid');
   }
@@ -197,7 +197,7 @@ function readPublicCertificate(publicCertificatePath) {
  * @private
  */
 function getPrivateKey(p12Path, alias, password) {
-  let p12Content = fs.readFileSync(p12Path, 'binary');
+  const p12Content = fs.readFileSync(p12Path, 'binary');
 
   if (!p12Content || p12Content.length <= 1) {
     throw new Error('p12 keystore content is empty');
@@ -212,13 +212,13 @@ function getPrivateKey(p12Path, alias, password) {
   }
 
   // Get asn1 from DER
-  let p12Asn1 = forge.asn1.fromDer(p12Content, false);
+  const p12Asn1 = forge.asn1.fromDer(p12Content, false);
 
   // Get p12 using the password
-  let p12 = forge.pkcs12.pkcs12FromAsn1(p12Asn1, false, password);
+  const p12 = forge.pkcs12.pkcs12FromAsn1(p12Asn1, false, password);
 
   // Get Key from p12
-  let keyObj = p12.getBags({
+  const keyObj = p12.getBags({
     friendlyName: alias,
     bagType: forge.pki.oids.pkcs8ShroudedKeyBag
   }).friendlyName[0];
@@ -296,12 +296,12 @@ function createMessageDigest(digest) {
  * @private
  */
 function isValidConfig(config) {
-  let propertiesBasic = ["oaepPaddingDigestAlgorithm", "dataEncoding", "encryptionCertificate", "encryptedValueFieldName"];
-  let propertiesField = ["ivFieldName", "encryptedKeyFieldName"];
-  let propertiesHeader = ["ivHeaderName", "encryptedKeyHeaderName", "oaepHashingAlgorithmHeaderName"];
-  let propertiesFingerprint = ["publicKeyFingerprintType", "publicKeyFingerprintFieldName", "publicKeyFingerprintHeaderName"];
-  let propertiesOptionalFingerprint = ["publicKeyFingerprint"];
-  let contains = (props) => {
+  const propertiesBasic = ["oaepPaddingDigestAlgorithm", "dataEncoding", "encryptionCertificate", "encryptedValueFieldName"];
+  const propertiesField = ["ivFieldName", "encryptedKeyFieldName"];
+  const propertiesHeader = ["ivHeaderName", "encryptedKeyHeaderName", "oaepHashingAlgorithmHeaderName"];
+  const propertiesFingerprint = ["publicKeyFingerprintType", "publicKeyFingerprintFieldName", "publicKeyFingerprintHeaderName"];
+  const propertiesOptionalFingerprint = ["publicKeyFingerprint"];
+  const contains = (props) => {
     return props.every((elem) => {
       return config[elem] !== null && typeof config[elem] !== "undefined";
     });

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

@@ -24,9 +24,9 @@ function FieldLevelEncryption(config) {
 function hasConfig(config, endpoint) {
   if (config && endpoint) {
     endpoint = endpoint.split("?").shift();
-    let conf = config.paths.find((elem) => {
+    const conf = config.paths.find((elem) => {
         // TODO grep from last index
-        let regex = new RegExp(elem.path, "g");
+        const regex = new RegExp(elem.path, "g");
         return endpoint.match(regex);
       }
     );
@@ -41,7 +41,7 @@ function hasConfig(config, endpoint) {
 function elemFromPath(path, obj) {
   try {
     let parent = null;
-    let paths = path.split(".");
+    const paths = path.split(".");
     if (path && paths.length > 0) {
       paths.forEach((e) => {
           parent = obj;
@@ -88,7 +88,7 @@ function encrypt(endpoint, header, body) {
         encryptBody.call(this, v, body);
       });
     } else {
-      let encParams = this.crypto.newEncryptionParams({});
+      const encParams = this.crypto.newEncryptionParams({});
       fleConfig.toEncrypt.forEach((v) => {
         body = encryptWithHeader.call(this, encParams, v, body);
       });
@@ -133,9 +133,9 @@ function decrypt(response) {
  * @param body Body to encrypt
  */
 function encryptBody(path, body) {
-  let elem = elemFromPath(path.element, body);
+  const elem = elemFromPath(path.element, body);
   if (elem && elem.node){
-    let encryptedData = this.crypto.encryptData({data: elem.node});
+    const encryptedData = this.crypto.encryptData({data: elem.node});
     utils.mutateObjectProperty(path.obj,
       encryptedData,
       body);
@@ -156,8 +156,8 @@ function encryptBody(path, body) {
  * @returns {Object} Encrypted body
  */
 function encryptWithHeader(encParams, path, body) {
-  let elem = elemFromPath(path.element, body).node;
-  let encrypted = this.crypto.encryptData({data: elem}, encParams);
+  const elem = elemFromPath(path.element, body).node;
+  const encrypted = this.crypto.encryptData({data: elem}, encParams);
   return {[path.obj]: {[this.config.encryptedValueFieldName]: encrypted[this.config.encryptedValueFieldName]}};
 }
 
@@ -171,7 +171,7 @@ function encryptWithHeader(encParams, path, body) {
 function decryptBody(path, body) {
   const elem = elemFromPath(path.element, body);
   if (elem && elem.node) {
-    let decryptedObj = this.crypto.decryptData(
+    const decryptedObj = this.crypto.decryptData(
       elem.node[this.config.encryptedValueFieldName], // encrypted data
       elem.node[this.config.ivFieldName], // iv field
       elem.node[this.config.oaepHashingAlgorithmFieldName], // oaepHashingAlgorithm
@@ -193,7 +193,7 @@ function decryptWithHeader(path, body, response) {
   const elemEncryptedNode = elemFromPath(path.obj, body);
   if (elemEncryptedNode.node[path.element]) {
     const encryptedData = elemEncryptedNode.node[path.element][this.config.encryptedValueFieldName];
-    for (let k in body) {
+    for (const k in body) {
       // noinspection JSUnfilteredForInLoop
       delete body[k];
     }

lib/mcapi/utils/utils.js

@@ -83,15 +83,15 @@ module.exports.mutateObjectProperty = function (path, value, obj, srcPath, prope
     if (srcPath !== null && srcPath !== undefined) {
       this.deleteNode(srcPath, obj, properties); // delete src
     }
-    let paths = path.split(".");
+    const paths = path.split(".");
     paths.forEach((e) => {
       if (!tmp.hasOwnProperty(e)) {
         tmp[e] = {};
       }
       prev = tmp;
       tmp = tmp[e];
     });
-    let elem = path.split(".").pop();
+    const elem = path.split(".").pop();
     if (typeof value === 'object' && !(value instanceof Array)) { // decrypted value
       if (typeof prev[elem] !== 'object') {
         prev[elem] = {};
@@ -107,8 +107,8 @@ module.exports.deleteNode = function (path, obj, properties) {
   properties = properties || [];
   let prev = obj;
   if (path !== null && path !== undefined && obj !== null && obj !== undefined) {
-    let paths = path.split('.');
-    let toDelete = paths[paths.length - 1];
+    const paths = path.split('.');
+    const toDelete = paths[paths.length - 1];
     paths.forEach((e, index) => {
       prev = obj;
       if (obj.hasOwnProperty(e)) {
@@ -127,7 +127,7 @@ module.exports.deleteNode = function (path, obj, properties) {
 };
 
 function overrideProperties(target, obj) {
-  for (let k in obj) {
+  for (const k in obj) {
     target[k] = obj[k];
   }
 }