auth0-deploy-cli 7.6.0 → 7.8.0

package/lib/utils.js

@@ -3,27 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapClientID2NameSorted = exports.convertClientIdToName = exports.clearClientArrays = exports.ensureProp = exports.clearTenantFlags = exports.recordsSorter = exports.formatResults = exports.hoursAsInteger = exports.sanitize = exports.stripIdentifiers = exports.toConfigFn = exports.existsMustBeDir = exports.dumpJSON = exports.loadJSON = exports.getFiles = exports.isFile = exports.isDirectory = void 0;
+exports.mapClientID2NameSorted = exports.convertClientIdToName = exports.clearClientArrays = exports.ensureProp = exports.clearTenantFlags = exports.recordsSorter = exports.formatResults = exports.sanitize = exports.stripIdentifiers = exports.toConfigFn = exports.existsMustBeDir = exports.dumpJSON = exports.loadJSON = exports.getFiles = exports.isFile = exports.isDirectory = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const sanitize_filename_1 = __importDefault(require("sanitize-filename"));
 const dot_prop_1 = __importDefault(require("dot-prop"));
 const tools_1 = require("./tools");
 const logger_1 = __importDefault(require("./logger"));
-function isDirectory(f) {
+function isDirectory(filePath) {
     try {
-        return fs_extra_1.default.statSync(path_1.default.resolve(f))
-            .isDirectory();
+        return fs_extra_1.default.statSync(path_1.default.resolve(filePath)).isDirectory();
     }
     catch (err) {
         return false;
     }
 }
 exports.isDirectory = isDirectory;
-function isFile(f) {
+function isFile(filePath) {
     try {
-        return fs_extra_1.default.statSync(path_1.default.resolve(f))
-            .isFile();
+        return fs_extra_1.default.statSync(path_1.default.resolve(filePath)).isFile();
     }
     catch (err) {
         return false;
@@ -32,7 +30,8 @@ function isFile(f) {
 exports.isFile = isFile;
 function getFiles(folder, exts) {
     if (isDirectory(folder)) {
-        return fs_extra_1.default.readdirSync(folder)
+        return fs_extra_1.default
+            .readdirSync(folder)
             .map((f) => path_1.default.join(folder, f))
             .filter((f) => isFile(f) && exts.includes(path_1.default.extname(f)));
     }
@@ -84,7 +83,7 @@ function stripIdentifiers(auth0, assets) {
         'emailTemplates',
         'guardianFactors',
         'guardianFactorProviders',
-        'guardianFactorTemplates'
+        'guardianFactorTemplates',
     ];
     // Optionally Strip identifiers
     auth0.handlers.forEach((h) => {
@@ -107,12 +106,6 @@ function sanitize(str) {
     return (0, sanitize_filename_1.default)(str, { replacement: '-' });
 }
 exports.sanitize = sanitize;
-function hoursAsInteger(property, hours) {
-    if (Number.isInteger(hours))
-        return { [property]: hours };
-    return { [`${property}_in_minutes`]: Math.round(hours * 60) };
-}
-exports.hoursAsInteger = hoursAsInteger;
 function formatResults(item) {
     if (typeof item !== 'object') {
         return item;
@@ -126,10 +119,12 @@ function formatResults(item) {
         strategy: null,
         script: null,
         stage: null,
-        id: null
+        id: null,
     };
     const result = Object.assign({}, importantFields);
-    Object.entries(item).sort().forEach(([key, value]) => {
+    Object.entries(item)
+        .sort()
+        .forEach(([key, value]) => {
         result[key] = value;
     });
     Object.keys(importantFields).forEach((key) => {
@@ -140,12 +135,7 @@ function formatResults(item) {
 }
 exports.formatResults = formatResults;
 function recordsSorter(a, b) {
-    const importantFields = [
-        'name',
-        'key',
-        'client_id',
-        'template'
-    ];
+    const importantFields = ['name', 'key', 'client_id', 'template'];
     for (let i = 0; i < importantFields.length; i += 1) {
         const key = importantFields[i];
         if (a[key] && b[key]) {
@@ -161,7 +151,8 @@ function clearTenantFlags(tenant) {
     }
 }
 exports.clearTenantFlags = clearTenantFlags;
-function ensureProp(obj, props, value = '') {
+function ensureProp(obj, props) {
+    const value = '';
     if (!dot_prop_1.default.has(obj, props)) {
         dot_prop_1.default.set(obj, props, value);
     }
@@ -169,8 +160,10 @@ function ensureProp(obj, props, value = '') {
 exports.ensureProp = ensureProp;
 function clearClientArrays(client) {
     const propsToClear = ['allowed_clients', 'allowed_logout_urls', 'allowed_origins', 'callbacks'];
+    //If designated properties are null, set them as empty arrays instead
     Object.keys(client).forEach((prop) => {
         if (propsToClear.indexOf(prop) >= 0 && !client[prop]) {
+            //TODO: understand why setting as empty array instead of deleting null prop. Ex: `delete client[prop]`
             client[prop] = [];
         }
     });
@@ -189,7 +182,7 @@ function convertClientIdToName(clientId, knownClients = []) {
 exports.convertClientIdToName = convertClientIdToName;
 function mapClientID2NameSorted(enabledClients, knownClients) {
     return [
-        ...(enabledClients || []).map((clientId) => convertClientIdToName(clientId, knownClients))
+        ...(enabledClients || []).map((clientId) => convertClientIdToName(clientId, knownClients)),
     ].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
 }
 exports.mapClientID2NameSorted = mapClientID2NameSorted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth0-deploy-cli",
-  "version": "7.6.0",
+  "version": "7.8.0",
   "description": "A command line tool for deploying updates to your Auth0 tenant",
   "main": "lib/index.js",
   "bin": {
@@ -9,6 +9,7 @@
   "scripts": {
     "lint:fix": "eslint --fix --ignore-path .eslintignore --ignore-pattern webpack . && kacl lint",
     "lint": "eslint --ignore-path .eslintignore --ignore-pattern webpack . && kacl lint",
+    "format": "npx prettier --write .",
     "pretest": "rimraf ./.nyc_output",
     "test": "ts-mocha -p tsconfig.json --recursive 'test/**/*.test*'",
     "build": "rimraf ./lib && npx tsc",
@@ -29,6 +30,9 @@
   "readme": "README.md",
   "homepage": "https://github.com/auth0/auth0-deploy-cli#readme",
   "dependencies": {
+    "@types/lodash": "^4.14.181",
+    "@types/nconf": "^0.10.2",
+    "@types/winston": "^2.4.4",
     "ajv": "^6.12.6",
     "auth0": "^2.40.0",
     "dot-prop": "^5.2.0",
@@ -37,26 +41,31 @@
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.20",
     "mkdirp": "^0.5.1",
-    "nconf": "^0.11.0",
+    "nconf": "^0.11.4",
     "promise-pool-executor": "^1.1.1",
     "sanitize-filename": "^1.6.1",
-    "winston": "^2.3.0",
+    "sinon": "^13.0.1",
+    "sinon-chai": "^3.7.0",
+    "winston": "^3.3.0",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
     "@types/expect": "^24.3.0",
     "@types/mocha": "^9.1.0",
-    "@typescript-eslint/parser": "^5.14.0",
-    "chai": "^4.1.2",
+    "chai": "^4.3.6",
+    "@typescript-eslint/parser": "^5.16.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^3.1.4",
     "eslint": "^7.28.0",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.25.4",
     "husky": "^7.0.4",
     "kacl": "^1.1.1",
-    "mocha": "^9.1.3",
+    "mocha": "^9.2.2",
     "nyc": "^15.0.1",
+    "prettier": "^2.6.1",
+    "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
     "rmdir-sync": "^1.0.1",
     "ts-mocha": "^9.0.2",

package/tsconfig.json

@@ -10,9 +10,8 @@
     "forceConsistentCasingInFileNames": true,
     "strict": false,
     "strictNullChecks": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "declaration": true
   },
-  "include": [
-    "src/**/*"
-  ]
+  "include": ["src/**/*"]
 }

package/typescript-migration-progress.sh

@@ -17,6 +17,6 @@ numJsFiles=$(find ./src -name "*.js" | wc -l | xargs)
 totalNumFiles=$(expr ${numTsFiles} + ${numJsFiles})
 percentFilesMigrated=$(expr $(expr ${numTsFiles} \* 100) / ${totalNumFiles})
 
-echo "${numTsFiles} of ${numJsFiles} (${percentFilesMigrated}%) files migrated to Typescript"
+echo "${numTsFiles} of ${totalNumFiles} (${percentFilesMigrated}%) files migrated to Typescript"
 
 echo "- - - - - - - - - - - - - - - - - - - - - -"

package/lib/tools/logger.js

@@ -1,15 +0,0 @@
-const winston = require('winston');
-winston.emitErrs = true;
-const logger = new winston.Logger({
-    transports: [
-        new winston.transports.Console({
-            timestamp: true,
-            level: 'info',
-            handleExceptions: true,
-            json: false,
-            colorize: true
-        })
-    ],
-    exitOnError: false
-});
-module.exports = logger;