auth0-deploy-cli 7.8.0 → 7.11.0

package/lib/tools/utils.js

@@ -22,11 +22,20 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripObfuscatedFieldsFromPayload = exports.obfuscateSensitiveValues = exports.areArraysEquals = exports.filterExcluded = exports.duplicateItems = exports.getEnabledClients = exports.stripFields = exports.convertJsonToString = exports.flatten = exports.loadFileAndReplaceKeywords = exports.convertClientNamesToIds = exports.convertClientNameToId = exports.keywordReplace = exports.keywordStringReplace = exports.keywordArrayReplace = void 0;
+exports.detectInsufficientScopeError = exports.stripObfuscatedFieldsFromPayload = exports.obfuscateSensitiveValues = exports.areArraysEquals = exports.filterExcluded = exports.duplicateItems = exports.getEnabledClients = exports.stripFields = exports.convertJsonToString = exports.flatten = exports.loadFileAndReplaceKeywords = exports.convertClientNamesToIds = exports.convertClientNameToId = exports.keywordReplace = exports.keywordStringReplace = exports.keywordArrayReplace = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importStar(require("fs"));
 const dot_prop_1 = __importDefault(require("dot-prop"));
@@ -56,8 +65,8 @@ exports.keywordStringReplace = keywordStringReplace;
 function keywordReplace(input, mappings) {
     // Replace keywords with mappings within input.
     if (mappings && Object.keys(mappings).length > 0) {
-        input = keywordStringReplace(input, mappings);
         input = keywordArrayReplace(input, mappings);
+        input = keywordStringReplace(input, mappings);
     }
     return input;
 }
@@ -208,3 +217,26 @@ const stripObfuscatedFieldsFromPayload = (data, obfuscatedFields) => {
     return newAsset;
 };
 exports.stripObfuscatedFieldsFromPayload = stripObfuscatedFieldsFromPayload;
+const detectInsufficientScopeError = (fn) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    try {
+        const data = yield fn();
+        return {
+            hadSufficientScopes: true,
+            data,
+            requiredScopes: [],
+        };
+    }
+    catch (err) {
+        if (err.statusCode === 403 && err.message.includes('Insufficient scope')) {
+            const requiredScopes = (_b = (_a = err.message) === null || _a === void 0 ? void 0 : _a.split('Insufficient scope, expected any of: ')) === null || _b === void 0 ? void 0 : _b.slice(1);
+            return {
+                hadSufficientScopes: false,
+                requiredScopes,
+                data: null,
+            };
+        }
+        throw err;
+    }
+});
+exports.detectInsufficientScopeError = detectInsufficientScopeError;

package/lib/types.d.ts

@@ -109,6 +109,7 @@ export declare type BaseAuth0APIClient = {
         }) => Promise<Promise<Asset[]>>;
         addSecrets: (arg0: {}, arg1: Asset) => Promise<void>;
     };
+    logStreams: APIClientBaseFunctions;
     migrations: APIClientBaseFunctions & {
         getMigrations: () => Promise<{
             flags: Asset[];
@@ -207,49 +208,58 @@ export declare type Config = {
 export declare type Asset = {
     [key: string]: any;
 };
-export declare type Assets = {
-    actions: Asset[];
-    attackProtection: Asset;
-    branding: Asset;
-    clients: Asset[];
-    clientGrants: Asset[];
-    connections: Asset[];
-    databases: Asset[];
-    emailProvider: Asset;
-    emailTemplates: Asset[];
-    guardianFactorProviders: Asset[];
-    guardianFactors: Asset[];
-    guardianFactorTemplates: Asset[];
+export declare type Assets = Partial<{
+    actions: Asset[] | null;
+    attackProtection: Asset | null;
+    branding: {
+        templates?: {
+            template: string;
+            body: string;
+        }[] | null;
+    } | null;
+    clients: Asset[] | null;
+    clientGrants: Asset[] | null;
+    connections: Asset[] | null;
+    databases: Asset[] | null;
+    emailProvider: Asset | null;
+    emailTemplates: Asset[] | null;
+    guardianFactorProviders: Asset[] | null;
+    guardianFactors: Asset[] | null;
+    guardianFactorTemplates: Asset[] | null;
     guardianPhoneFactorMessageTypes: {
         message_types: Asset[];
-    };
-    guardianPhoneFactorSelectedProvider: Asset;
+    } | null;
+    guardianPhoneFactorSelectedProvider: Asset | null;
     guardianPolicies: {
         policies: Asset[];
-    };
-    hooks: Asset[];
-    migrations: Asset[];
-    organizations: Asset[];
-    pages: Asset[];
-    resourceServers: Asset[];
-    roles: Asset[];
-    rules: Asset[];
-    rulesConfigs: Asset[];
-    tenant: Asset;
-    triggers: Asset[];
+    } | null;
+    hooks: Asset[] | null;
+    logStreams: Asset[] | null;
+    migrations: Asset[] | null;
+    organizations: Asset[] | null;
+    pages: Asset[] | null;
+    resourceServers: Asset[] | null;
+    roles: Asset[] | null;
+    rules: Asset[] | null;
+    rulesConfigs: Asset[] | null;
+    tenant: Asset | null;
+    triggers: Asset[] | null;
     exclude?: {
         [key: string]: string[];
     };
-    clientsOrig: Asset[];
-};
+    clientsOrig: Asset[] | null;
+}>;
 export declare type CalculatedChanges = {
     del: Asset[];
     update: Asset[];
     conflicts: Asset[];
     create: Asset[];
 };
-export declare type AssetTypes = 'rules' | 'rulesConfigs' | 'hooks' | 'pages' | 'databases' | 'clientGrants' | 'resourceServers' | 'clients' | 'connections' | 'tenant' | 'emailProvider' | 'emailTemplates' | 'guardianFactors' | 'guardianFactorProviders' | 'guardianFactorTemplates' | 'migrations' | 'guardianPhoneFactorMessageTypes' | 'guardianPhoneFactorSelectedProvider' | 'guardianPolicies' | 'roles' | 'actions' | 'organizations' | 'triggers' | 'attackProtection' | 'branding';
+export declare type AssetTypes = 'rules' | 'rulesConfigs' | 'hooks' | 'pages' | 'databases' | 'clientGrants' | 'resourceServers' | 'clients' | 'connections' | 'tenant' | 'emailProvider' | 'emailTemplates' | 'guardianFactors' | 'guardianFactorProviders' | 'guardianFactorTemplates' | 'migrations' | 'guardianPhoneFactorMessageTypes' | 'guardianPhoneFactorSelectedProvider' | 'guardianPolicies' | 'roles' | 'actions' | 'organizations' | 'triggers' | 'attackProtection' | 'branding' | 'logStreams';
 export declare type KeywordMappings = {
     [key: string]: (string | number)[] | string | number;
 };
+export declare type ParsedAsset<Key extends AssetTypes, T> = {
+    [key in Key]: T | null;
+};
 export {};

package/lib/utils.d.ts

@@ -10,39 +10,45 @@ export declare function dumpJSON(file: string, mappings: {
 export declare function existsMustBeDir(folder: string): boolean;
 export declare function toConfigFn(data: Config): (arg0: keyof Config) => any;
 export declare function stripIdentifiers(auth0: Auth0, assets: Assets): {
-    actions: Asset[];
-    attackProtection: Asset;
-    branding: Asset;
-    clients: Asset[];
-    clientGrants: Asset[];
-    connections: Asset[];
-    databases: Asset[];
-    emailProvider: Asset;
-    emailTemplates: Asset[];
-    guardianFactorProviders: Asset[];
-    guardianFactors: Asset[];
-    guardianFactorTemplates: Asset[];
-    guardianPhoneFactorMessageTypes: {
+    actions?: Asset[] | null | undefined;
+    attackProtection?: Asset | null | undefined;
+    branding?: {
+        templates?: {
+            template: string;
+            body: string;
+        }[] | null | undefined;
+    } | null | undefined;
+    clients?: Asset[] | null | undefined;
+    clientGrants?: Asset[] | null | undefined;
+    connections?: Asset[] | null | undefined;
+    databases?: Asset[] | null | undefined;
+    emailProvider?: Asset | null | undefined;
+    emailTemplates?: Asset[] | null | undefined;
+    guardianFactorProviders?: Asset[] | null | undefined;
+    guardianFactors?: Asset[] | null | undefined;
+    guardianFactorTemplates?: Asset[] | null | undefined;
+    guardianPhoneFactorMessageTypes?: {
         message_types: Asset[];
-    };
-    guardianPhoneFactorSelectedProvider: Asset;
-    guardianPolicies: {
+    } | null | undefined;
+    guardianPhoneFactorSelectedProvider?: Asset | null | undefined;
+    guardianPolicies?: {
         policies: Asset[];
-    };
-    hooks: Asset[];
-    migrations: Asset[];
-    organizations: Asset[];
-    pages: Asset[];
-    resourceServers: Asset[];
-    roles: Asset[];
-    rules: Asset[];
-    rulesConfigs: Asset[];
-    tenant: Asset;
-    triggers: Asset[];
+    } | null | undefined;
+    hooks?: Asset[] | null | undefined;
+    logStreams?: Asset[] | null | undefined;
+    migrations?: Asset[] | null | undefined;
+    organizations?: Asset[] | null | undefined;
+    pages?: Asset[] | null | undefined;
+    resourceServers?: Asset[] | null | undefined;
+    roles?: Asset[] | null | undefined;
+    rules?: Asset[] | null | undefined;
+    rulesConfigs?: Asset[] | null | undefined;
+    tenant?: Asset | null | undefined;
+    triggers?: Asset[] | null | undefined;
     exclude?: {
         [key: string]: string[];
     } | undefined;
-    clientsOrig: Asset[];
+    clientsOrig?: Asset[] | null | undefined;
 };
 export declare function sanitize(str: string): string;
 declare type ImportantFields = {

package/lib/utils.js

@@ -107,7 +107,7 @@ function sanitize(str) {
 }
 exports.sanitize = sanitize;
 function formatResults(item) {
-    if (typeof item !== 'object') {
+    if (!item || typeof item !== 'object') {
         return item;
     }
     const importantFields = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auth0-deploy-cli",
-  "version": "7.8.0",
+  "version": "7.11.0",
   "description": "A command line tool for deploying updates to your Auth0 tenant",
   "main": "lib/index.js",
   "bin": {
@@ -40,35 +40,38 @@
     "global-agent": "^2.1.12",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.20",
-    "mkdirp": "^0.5.1",
-    "nconf": "^0.11.4",
+    "mkdirp": "^0.5.6",
+    "nconf": "^0.12.0",
     "promise-pool-executor": "^1.1.1",
     "sanitize-filename": "^1.6.1",
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
-    "winston": "^3.3.0",
+    "winston": "^3.7.2",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
     "@types/expect": "^24.3.0",
     "@types/mocha": "^9.1.0",
     "chai": "^4.3.6",
-    "@typescript-eslint/parser": "^5.16.0",
+    "@typescript-eslint/parser": "^5.18.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^3.1.4",
     "eslint": "^7.28.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "husky": "^7.0.4",
     "kacl": "^1.1.1",
     "mocha": "^9.2.2",
     "nyc": "^15.0.1",
-    "prettier": "^2.6.1",
+    "prettier": "^2.6.2",
     "pretty-quick": "^3.1.3",
     "rimraf": "^3.0.2",
     "rmdir-sync": "^1.0.1",
     "ts-mocha": "^9.0.2",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
+  },
+  "overrides": {
+    "istanbul-reports": "3.1.4"
   }
 }