@contentstack/cli-utilities 1.0.2 → 1.0.3

package/lib/config-handler.js

@@ -4,10 +4,10 @@ const tslib_1 = require("tslib");
 const conf_1 = tslib_1.__importDefault(require("conf"));
 const uuid_1 = require("uuid");
 const fs_1 = require("fs");
-const ENC_KEY = 'encryptionKey';
-const ENCRYPT_CONF = true;
-const CONFIG_NAME = 'contentstack_cli';
-const ENC_CONFIG_NAME = 'contentstack_cli_obfuscate';
+const ENC_KEY = process.env.ENC_KEY || 'encryptionKey';
+const ENCRYPT_CONF = process.env.ENCRYPT_CONF === 'true' || false;
+const CONFIG_NAME = process.env.CONFIG_NAME || 'contentstack_cli';
+const ENC_CONFIG_NAME = process.env.ENC_CONFIG_NAME || 'contentstack_cli_obfuscate';
 const OLD_CONFIG_BACKUP_FLAG = 'isOldConfigBackup';
 const xdgBasedir = require('xdg-basedir');
 const path = require('path');
@@ -108,7 +108,7 @@ class Config {
                     const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
                     this.getEncryptedConfig(oldConfigData, true);
                 }
-                catch (error) {
+                catch (_error) {
                     // console.trace(error.message)
                 }
             }
@@ -146,14 +146,14 @@ class Config {
                 const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
                 this.getDecryptedConfig(oldConfigData); // NOTE NOTE reinitialize the config with old data and new decrypted file
             }
-            catch (error) {
+            catch (_error) {
                 // console.trace(error.message)
                 try {
                     const config = this.fallbackInit();
-                    const configData = this.getConfigDataAndUnlinkConfigFile(config);
-                    this.getDecryptedConfig(configData); // NOTE reinitialize the config with old data and new decrypted file
+                    const _configData = this.getConfigDataAndUnlinkConfigFile(config);
+                    this.getDecryptedConfig(_configData); // NOTE reinitialize the config with old data and new decrypted file
                 }
-                catch (error) {
+                catch (__error) {
                     // console.trace(error.message)
                 }
             }

package/lib/encrypter.js

@@ -3,46 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const defaultValues = {
-    typeIdentifier: "◈",
-    algorithm: "aes-192-cbc",
-    encryptionKey: "nF2ejRQcTv",
+    typeIdentifier: '◈',
+    algorithm: 'aes-192-cbc',
+    //   file deepcode ignore HardcodedNonCryptoSecret: <This is a ToDo>
+    encryptionKey: 'nF2ejRQcTv',
 };
 class NodeCrypto {
     constructor(config = defaultValues) {
         const { algorithm, encryptionKey, typeIdentifier } = config;
         this.algorithm = algorithm;
         this.typeIdentifier = typeIdentifier;
-        this.key = crypto_1.default.scryptSync(encryptionKey, "salt", 24);
+        this.key = crypto_1.default.scryptSync(encryptionKey, 'salt', 24);
     }
     encrypt(plainData) {
         const iv = crypto_1.default.randomBytes(16);
         const cipher = crypto_1.default.createCipheriv(this.algorithm, this.key, iv);
         let data = plainData;
         switch (typeof plainData) {
-            case "number":
+            case 'number':
                 data = `${String(plainData)}${this.typeIdentifier}number`;
                 break;
-            case "object":
+            case 'object':
                 data = `${JSON.stringify(plainData)}${this.typeIdentifier}object`;
                 break;
         }
-        const encrypted = cipher.update(data, "utf8", "hex");
-        return [
-            encrypted + cipher.final("hex"),
-            Buffer.from(iv).toString("hex"),
-        ].join("|");
+        const encrypted = cipher.update(data, 'utf8', 'hex');
+        return [encrypted + cipher.final('hex'), Buffer.from(iv).toString('hex')].join('|');
     }
     decrypt(encryptedData) {
-        const [encrypted, iv] = encryptedData.split("|");
+        const [encrypted, iv] = encryptedData.split('|');
         if (!iv)
-            throw new Error("IV not found");
-        const decipher = crypto_1.default.createDecipheriv(this.algorithm, this.key, Buffer.from(iv, "hex"));
-        const result = decipher.update(encrypted, "hex", "utf8") + decipher.final("utf8");
+            throw new Error('IV not found');
+        const decipher = crypto_1.default.createDecipheriv(this.algorithm, this.key, Buffer.from(iv, 'hex'));
+        const result = decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8');
         const [data, type] = result.split(this.typeIdentifier);
         switch (type) {
-            case "number":
+            case 'number':
                 return Number(data);
-            case "object":
+            case 'object':
                 return JSON.parse(data);
         }
         return data;

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chooseLocalePrompt = exports.NodeCrypto = exports.printFlagDeprecation = exports.configHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
+exports.NodeCrypto = exports.printFlagDeprecation = exports.configHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
 const tslib_1 = require("tslib");
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return tslib_1.__importDefault(logger_1).default; } });
@@ -17,5 +17,3 @@ Object.defineProperty(exports, "printFlagDeprecation", { enumerable: true, get:
 tslib_1.__exportStar(require("./http-client"), exports);
 var encrypter_1 = require("./encrypter");
 Object.defineProperty(exports, "NodeCrypto", { enumerable: true, get: function () { return tslib_1.__importDefault(encrypter_1).default; } });
-var selectors_1 = require("./selectors");
-Object.defineProperty(exports, "chooseLocalePrompt", { enumerable: true, get: function () { return selectors_1.chooseLocale; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "./types/index.d.ts",
@@ -38,35 +38,32 @@
     "ora": "^5.4.0",
     "unique-string": "^2.0.0",
     "winston": "^3.7.2",
-    "xdg-basedir": "^4.0.0"
+    "xdg-basedir": "^4.0.0",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@oclif/plugin-help": "^5.1.12",
     "@oclif/test": "^1.2.8",
-    "@types/axios": "^0.14.0",
     "@types/chai": "^4.2.18",
-    "@types/conf": "^3.0.0",
-    "@types/dot-prop": "^5.0.1",
     "@types/inquirer": "^7.3.1",
     "@types/mkdirp": "^1.0.1",
     "@types/mocha": "^8.2.2",
-    "@types/nock": "^11.1.0",
     "@types/node": "^14.14.32",
     "@types/sinon": "^10.0.2",
     "@types/tar": "^4.0.3",
-    "@types/winston": "^2.4.4",
     "chai": "^4.3.4",
     "eslint": "^8.18.0",
     "eslint-config-oclif": "^3.1.0",
-    "eslint-config-oclif-typescript": "^0.1.0",
+    "eslint-config-oclif-typescript": "^0.2.0",
+    "fancy-test": "^2.0.0",
     "globby": "^10.0.2",
-    "mocha": "^9.2.2",
+    "mocha": "^10.0.0",
     "nock": "^13.1.0",
     "nyc": "^15.1.0",
     "rimraf": "^2.7.1",
     "sinon": "^11.1.1",
     "tmp": "^0.2.1",
-    "ts-node": "^8.10.2",
+    "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   }
-}
+}

package/src/config-handler.ts

@@ -2,10 +2,10 @@ import Conf from 'conf';
 import { v4 as uuid } from 'uuid';
 import { existsSync, unlinkSync, readFileSync } from 'fs';
 
-const ENC_KEY = 'encryptionKey';
-const ENCRYPT_CONF: boolean = true
-const CONFIG_NAME = 'contentstack_cli';
-const ENC_CONFIG_NAME = 'contentstack_cli_obfuscate';
+const ENC_KEY = process.env.ENC_KEY || 'encryptionKey';
+const ENCRYPT_CONF: boolean = process.env.ENCRYPT_CONF === 'true' || false;
+const CONFIG_NAME = process.env.CONFIG_NAME || 'contentstack_cli';
+const ENC_CONFIG_NAME = process.env.ENC_CONFIG_NAME || 'contentstack_cli_obfuscate';
 const OLD_CONFIG_BACKUP_FLAG = 'isOldConfigBackup'
 
 const xdgBasedir = require('xdg-basedir');
@@ -41,8 +41,8 @@ class Config {
         }
       } catch (error) {
         console.log("No data to be imported from Old config file");
-
       }
+
       this.set(OLD_CONFIG_BACKUP_FLAG, true)
     }
   }
@@ -52,10 +52,10 @@ class Config {
     for (const key in data) {
       const value = data[key];
       const setPath = _path ? _path + '.' + key : key
+
       if (typeof (value) == "object") {
         this.setOldConfigStoreData(value, setPath)
-      }
-      else {
+      } else {
         this.set(setPath, value)
       }
     }
@@ -121,7 +121,7 @@ class Config {
           const config = this.fallbackInit()
           const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config)
           this.getEncryptedConfig(oldConfigData, true)
-        } catch (error) {
+        } catch (_error) {
           // console.trace(error.message)
         }
       }
@@ -159,14 +159,14 @@ class Config {
         let config = new Conf({ configName: CONFIG_NAME, encryptionKey })
         const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config)
         this.getDecryptedConfig(oldConfigData) // NOTE NOTE reinitialize the config with old data and new decrypted file
-      } catch (error) {
+      } catch (_error) {
         // console.trace(error.message)
 
         try {
           const config = this.fallbackInit()
-          const configData = this.getConfigDataAndUnlinkConfigFile(config)
-          this.getDecryptedConfig(configData) // NOTE reinitialize the config with old data and new decrypted file
-        } catch (error) {
+          const _configData = this.getConfigDataAndUnlinkConfigFile(config)
+          this.getDecryptedConfig(_configData) // NOTE reinitialize the config with old data and new decrypted file
+        } catch (__error) {
           // console.trace(error.message)
         }
       }

package/src/encrypter.ts

@@ -1,4 +1,4 @@
-import crypto from "crypto";
+import crypto from 'crypto';
 
 type CryptoConfig = {
   algorithm?: string;
@@ -7,9 +7,10 @@ type CryptoConfig = {
 };
 
 const defaultValues: CryptoConfig = {
-  typeIdentifier: "◈",
-  algorithm: "aes-192-cbc",
-  encryptionKey: "nF2ejRQcTv",
+  typeIdentifier: '◈',
+  algorithm: 'aes-192-cbc',
+  //   file deepcode ignore HardcodedNonCryptoSecret: <This is a ToDo>
+  encryptionKey: 'nF2ejRQcTv',
 };
 
 export default class NodeCrypto {
@@ -21,7 +22,7 @@ export default class NodeCrypto {
     const { algorithm, encryptionKey, typeIdentifier } = config;
     this.algorithm = algorithm;
     this.typeIdentifier = typeIdentifier;
-    this.key = crypto.scryptSync(encryptionKey, "salt", 24);
+    this.key = crypto.scryptSync(encryptionKey, 'salt', 24);
   }
 
   encrypt(plainData) {
@@ -30,38 +31,30 @@ export default class NodeCrypto {
     let data = plainData;
 
     switch (typeof plainData) {
-      case "number":
+      case 'number':
         data = `${String(plainData)}${this.typeIdentifier}number`;
         break;
-      case "object":
+      case 'object':
         data = `${JSON.stringify(plainData)}${this.typeIdentifier}object`;
         break;
     }
 
-    const encrypted = cipher.update(data, "utf8", "hex");
+    const encrypted = cipher.update(data, 'utf8', 'hex');
 
-    return [
-      encrypted + cipher.final("hex"),
-      Buffer.from(iv).toString("hex"),
-    ].join("|");
+    return [encrypted + cipher.final('hex'), Buffer.from(iv).toString('hex')].join('|');
   }
 
   decrypt(encryptedData) {
-    const [encrypted, iv] = encryptedData.split("|");
-    if (!iv) throw new Error("IV not found");
-    const decipher = crypto.createDecipheriv(
-      this.algorithm,
-      this.key,
-      Buffer.from(iv, "hex")
-    );
-    const result =
-      decipher.update(encrypted, "hex", "utf8") + decipher.final("utf8");
+    const [encrypted, iv] = encryptedData.split('|');
+    if (!iv) throw new Error('IV not found');
+    const decipher = crypto.createDecipheriv(this.algorithm, this.key, Buffer.from(iv, 'hex'));
+    const result = decipher.update(encrypted, 'hex', 'utf8') + decipher.final('utf8');
     const [data, type] = result.split(this.typeIdentifier);
 
     switch (type) {
-      case "number":
+      case 'number':
         return Number(data);
-      case "object":
+      case 'object':
         return JSON.parse(data);
     }
 

package/src/index.ts

@@ -6,4 +6,3 @@ export { default as configHandler } from './config-handler';
 export { default as printFlagDeprecation } from './flag-deprecation-check';
 export * from './http-client';
 export { default as NodeCrypto } from './encrypter'
-export { chooseLocale as chooseLocalePrompt } from './selectors';

package/types/index.d.ts

@@ -6,4 +6,3 @@ export { default as configHandler } from './config-handler';
 export { default as printFlagDeprecation } from './flag-deprecation-check';
 export * from './http-client';
 export { default as NodeCrypto } from './encrypter';
-export { chooseLocale as chooseLocalePrompt } from './selectors';