auth0-deploy-cli 7.3.7 → 7.5.1

package/lib/tools/auth0/handlers/rules.js

@@ -1,198 +1,177 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.schema = exports.excludeSchema = undefined;
-
-var _ValidationError = require("../../ValidationError");
-
-var _ValidationError2 = _interopRequireDefault(_ValidationError);
-
-var _utils = require("../../utils");
-
-var _default = require("./default");
-
-var _default2 = _interopRequireDefault(_default);
-
-var _logger = require("../../logger");
-
-var _logger2 = _interopRequireDefault(_logger);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const excludeSchema = exports.excludeSchema = {
-  type: 'array',
-  items: {
-    type: 'string'
-  }
+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());
+    });
 };
-const schema = exports.schema = {
-  type: 'array',
-  items: {
-    type: 'object',
-    default: [],
-    properties: {
-      script: {
-        type: 'string',
-        description: 'A script that contains the rule\'s code',
-        default: ''
-      },
-      name: {
-        type: 'string',
-        description: 'The name of the rule. Can only contain alphanumeric characters, spaces and \'-\'. Can neither start nor end with \'-\' or spaces',
-        pattern: '^[^-\\s][a-zA-Z0-9-\\s]+[^-\\s]$'
-      },
-      order: {
-        type: ['number', 'null'],
-        description: 'The rule\'s order in relation to other rules. A rule with a lower order than another rule executes first.',
-        default: null
-      },
-      enabled: {
-        type: 'boolean',
-        description: 'true if the rule is enabled, false otherwise',
-        default: true
-      },
-      stage: {
-        type: 'string',
-        description: 'The rule\'s execution stage',
-        default: 'login_success',
-        enum: ['login_success', 'login_failure', 'pre_authorize']
-      }
-    },
-    required: ['name']
-  }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
-class RulesHandler extends _default2.default {
-  constructor(options) {
-    super({ ...options,
-      type: 'rules',
-      stripUpdateFields: ['stage']
-    });
-  }
-
-  async getType() {
-    if (this.existing) return this.existing;
-    this.existing = await this.client.rules.getAll({
-      paginate: true,
-      include_totals: true
-    });
-    return this.existing;
-  }
-
-  objString(rule) {
-    return super.objString({
-      name: rule.name,
-      order: rule.order
-    });
-  }
-
-  async calcChanges(assets, includeExcluded = false) {
-    let {
-      rules
-    } = assets;
-    const excludedRules = assets.exclude && assets.exclude.rules || [];
-    let existing = await this.getType();
-
-    if (!includeExcluded) {
-      rules = rules.filter(r => !excludedRules.includes(r.name));
-      existing = existing.filter(r => !excludedRules.includes(r.name));
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = exports.excludeSchema = void 0;
+const ValidationError_1 = __importDefault(require("../../ValidationError"));
+const utils_1 = require("../../utils");
+const default_1 = __importDefault(require("./default"));
+const logger_1 = __importDefault(require("../../logger"));
+exports.excludeSchema = {
+    type: 'array',
+    items: { type: 'string' }
+};
+exports.schema = {
+    type: 'array',
+    items: {
+        type: 'object',
+        default: [],
+        properties: {
+            script: {
+                type: 'string',
+                description: 'A script that contains the rule\'s code',
+                default: ''
+            },
+            name: {
+                type: 'string',
+                description: 'The name of the rule. Can only contain alphanumeric characters, spaces and \'-\'. Can neither start nor end with \'-\' or spaces',
+                pattern: '^[^-\\s][a-zA-Z0-9-\\s]+[^-\\s]$'
+            },
+            order: {
+                type: ['number', 'null'],
+                description: 'The rule\'s order in relation to other rules. A rule with a lower order than another rule executes first.',
+                default: null
+            },
+            enabled: {
+                type: 'boolean',
+                description: 'true if the rule is enabled, false otherwise',
+                default: true
+            },
+            stage: {
+                type: 'string',
+                description: 'The rule\'s execution stage',
+                default: 'login_success',
+                enum: ['login_success', 'login_failure', 'pre_authorize']
+            }
+        },
+        required: ['name']
     }
-
-    const {
-      del,
-      update,
-      create,
-      conflicts
-    } = (0, _utils.calcChanges)(this, rules, existing, ['id', 'name']);
-    const futureRules = [...create, ...update];
-    const futureMaxOrder = Math.max(...futureRules.map(r => r.order));
-    const existingMaxOrder = Math.max(...existing.map(r => r.order));
-    let nextOrderNo = Math.max(futureMaxOrder, existingMaxOrder);
-    const reOrder = futureRules.reduce((accum, r) => {
-      const conflict = existing.find(f => r.order === f.order && r.name !== f.name);
-
-      if (conflict) {
-        nextOrderNo += 1;
-        accum.push({ ...conflict,
-          order: nextOrderNo
+};
+class RulesHandler extends default_1.default {
+    constructor(options) {
+        super(Object.assign(Object.assign({}, options), { type: 'rules', stripUpdateFields: ['stage'] // Fields not allowed in updates
+         }));
+    }
+    getType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.existing)
+                return this.existing;
+            this.existing = yield this.client.rules.getAll({ paginate: true, include_totals: true });
+            return this.existing;
         });
-      }
-
-      return accum;
-    }, []);
-    return {
-      del,
-      update,
-      create,
-      reOrder,
-      conflicts
-    };
-  }
-
-  async validate(assets) {
-    const {
-      rules
-    } = assets;
-    if (!rules) return;
-    const excludedRules = assets.exclude && assets.exclude.rules || [];
-    const {
-      update,
-      create,
-      del
-    } = await this.calcChanges(assets, true);
-    const futureRules = [...create, ...update, ...del.filter(r => excludedRules.includes(r.name))];
-    const rulesSameOrder = (0, _utils.duplicateItems)(futureRules, 'order');
-
-    if (rulesSameOrder.length > 0) {
-      const formatted = rulesSameOrder.map(dups => dups.map(d => `${d.name}`));
-      throw new _ValidationError2.default(`There are multiple rules for the following stage-order combinations
-      ${(0, _utils.dumpJSON)(formatted)}.
-       Only one rule must be defined for the same order number in a stage.`);
     }
-
-    const existing = await this.getType();
-    const stateChanged = futureRules.reduce((changed, rule) => [...changed, ...existing.filter(r => rule.name.toLowerCase() === r.name.toLowerCase() && r.stage !== rule.stage)], []).map(r => r.name);
-
-    if (stateChanged.length > 0) {
-      throw new _ValidationError2.default(`The following rules changed stage which is not allowed:
-      ${(0, _utils.dumpJSON)(stateChanged)}.
+    objString(rule) {
+        return super.objString({ name: rule.name, order: rule.order });
+    }
+    calcChanges(assets, includeExcluded = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { rules } = assets;
+            const excludedRules = (assets.exclude && assets.exclude.rules) || [];
+            let existing = yield this.getType();
+            // Filter excluded rules
+            if (!includeExcluded) {
+                rules = rules.filter((r) => !excludedRules.includes(r.name));
+                existing = existing.filter((r) => !excludedRules.includes(r.name));
+            }
+            // Figure out what needs to be updated vs created
+            const { del, update, create, conflicts } = (0, utils_1.calcChanges)(this, rules, existing, ['id', 'name']);
+            // Figure out the rules that need to be re-ordered
+            const futureRules = [...create, ...update];
+            const futureMaxOrder = Math.max(...futureRules.map((r) => r.order));
+            const existingMaxOrder = Math.max(...existing.map((r) => r.order));
+            let nextOrderNo = Math.max(futureMaxOrder, existingMaxOrder);
+            const reOrder = futureRules.reduce((accum, r) => {
+                const conflict = existing.find((f) => r.order === f.order && r.name !== f.name);
+                if (conflict) {
+                    nextOrderNo += 1;
+                    accum.push(Object.assign(Object.assign({}, conflict), { order: nextOrderNo }));
+                }
+                return accum;
+            }, []);
+            return {
+                del,
+                update,
+                create,
+                reOrder,
+                conflicts
+            };
+        });
+    }
+    validate(assets) {
+        const _super = Object.create(null, {
+            validate: { get: () => super.validate }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { rules } = assets;
+            // Do nothing if not set
+            if (!rules)
+                return;
+            const excludedRules = (assets.exclude && assets.exclude.rules) || [];
+            // Figure out what needs to be updated vs created
+            const { update, create, del } = yield this.calcChanges(assets, true);
+            // Include del rules which are actually not going to be deleted but are excluded
+            // they can still muck up the ordering so we must take it into consideration.
+            const futureRules = [...create, ...update, ...del.filter((r) => excludedRules.includes(r.name))];
+            // Detect rules with the same order
+            const rulesSameOrder = (0, utils_1.duplicateItems)(futureRules, 'order');
+            if (rulesSameOrder.length > 0) {
+                const formatted = rulesSameOrder.map((dups) => dups.map((d) => `${d.name}`));
+                throw new ValidationError_1.default(`There are multiple rules for the following stage-order combinations
+      ${(0, utils_1.dumpJSON)(formatted)}.
+       Only one rule must be defined for the same order number in a stage.`);
+            }
+            // Detect Rules that are changing stage as it's not allowed.
+            const existing = yield this.getType();
+            const stateChanged = futureRules.reduce((changed, rule) => ([
+                ...changed,
+                ...existing.filter((r) => rule.name.toLowerCase() === r.name.toLowerCase() && r.stage !== rule.stage)
+            ]), []).map((r) => r.name);
+            if (stateChanged.length > 0) {
+                throw new ValidationError_1.default(`The following rules changed stage which is not allowed:
+      ${(0, utils_1.dumpJSON)(stateChanged)}.
       Rename the rules to recreate them and avoid this error.`);
+            }
+            yield _super.validate.call(this, assets);
+        });
+    }
+    processChanges(assets) {
+        const _super = Object.create(null, {
+            processChanges: { get: () => super.processChanges }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const { rules } = assets;
+            // Do nothing if not set
+            if (!rules)
+                return;
+            // Figure out what needs to be updated vs created
+            const changes = yield this.calcChanges(assets);
+            // Temporally re-order rules with conflicting ordering
+            yield this.client.pool.addEachTask({
+                data: changes.reOrder,
+                generator: (rule) => this.client.updateRule({ id: rule.id }, (0, utils_1.stripFields)(rule, this.stripUpdateFields)).then(() => {
+                    const updated = {
+                        name: rule.name, stage: rule.stage, order: rule.order, id: rule.id
+                    };
+                    logger_1.default.info(`Temporally re-order Rule ${(0, utils_1.dumpJSON)(updated)}`);
+                })
+            }).promise();
+            yield _super.processChanges.call(this, assets, {
+                del: changes.del,
+                create: changes.create,
+                update: changes.update,
+                conflicts: changes.conflicts
+            });
+        });
     }
-
-    await super.validate(assets);
-  }
-
-  async processChanges(assets) {
-    const {
-      rules
-    } = assets;
-    if (!rules) return;
-    const changes = await this.calcChanges(assets);
-    await this.client.pool.addEachTask({
-      data: changes.reOrder,
-      generator: rule => this.client.updateRule({
-        id: rule.id
-      }, (0, _utils.stripFields)(rule, this.stripUpdateFields)).then(() => {
-        const updated = {
-          name: rule.name,
-          stage: rule.stage,
-          order: rule.order,
-          id: rule.id
-        };
-
-        _logger2.default.info(`Temporally re-order Rule ${(0, _utils.dumpJSON)(updated)}`);
-      })
-    }).promise();
-    await super.processChanges(assets, {
-      del: changes.del,
-      create: changes.create,
-      update: changes.update,
-      conflicts: changes.conflicts
-    });
-  }
-
 }
-
-exports.default = RulesHandler;
+exports.default = RulesHandler;

package/lib/tools/auth0/handlers/rulesConfigs.js

@@ -1,67 +1,58 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.schema = undefined;
-
-var _default = require("./default");
-
-var _default2 = _interopRequireDefault(_default);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const schema = exports.schema = {
-  type: 'array',
-  items: {
-    type: 'object',
-    properties: {
-      key: {
-        type: 'string',
-        pattern: '^[A-Za-z0-9_-]*$'
-      },
-      value: {
-        type: 'string'
-      }
+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.schema = void 0;
+const default_1 = __importDefault(require("./default"));
+exports.schema = {
+    type: 'array',
+    items: {
+        type: 'object',
+        properties: {
+            key: { type: 'string', pattern: '^[A-Za-z0-9_-]*$' },
+            value: { type: 'string' }
+        },
+        required: ['key', 'value']
     },
-    required: ['key', 'value']
-  },
-  additionalProperties: false
+    additionalProperties: false
 };
-
-class RulesConfigsHandler extends _default2.default {
-  constructor(options) {
-    super({ ...options,
-      type: 'rulesConfigs',
-      id: 'key',
-      functions: {
-        update: 'set'
-      }
-    });
-  }
-
-  async getType() {
-    return this.client.rulesConfigs.getAll();
-  }
-
-  objString(item) {
-    return super.objString({
-      key: item.key
-    });
-  }
-
-  async calcChanges(assets) {
-    const {
-      rulesConfigs
-    } = assets;
-    if (!rulesConfigs || !rulesConfigs.length) return {};
-    return {
-      del: [],
-      update: rulesConfigs,
-      create: []
-    };
-  }
-
+class RulesConfigsHandler extends default_1.default {
+    constructor(options) {
+        super(Object.assign(Object.assign({}, options), { type: 'rulesConfigs', id: 'key', functions: {
+                update: 'set' // Update or Creation of a ruleConfig is via set not update
+            } }));
+    }
+    getType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.client.rulesConfigs.getAll();
+        });
+    }
+    objString(item) {
+        return super.objString({ key: item.key });
+    }
+    calcChanges(assets) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { rulesConfigs } = assets;
+            // Do nothing if not set
+            if (!rulesConfigs || !rulesConfigs.length)
+                return {};
+            // Intention is to not delete/cleanup old configRules, that needs to be handled manually.
+            return {
+                del: [],
+                update: rulesConfigs,
+                create: []
+            };
+        });
+    }
 }
-
-exports.default = RulesConfigsHandler;
+exports.default = RulesConfigsHandler;

package/lib/tools/auth0/handlers/tenant.js

@@ -1,70 +1,94 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-exports.default = exports.schema = undefined;
-
-var _dec, _class;
-
-var _ValidationError = require("../../ValidationError");
-
-var _ValidationError2 = _interopRequireDefault(_ValidationError);
-
-var _default = require("./default");
-
-var _default2 = _interopRequireDefault(_default);
-
-var _pages = require("./pages");
-
-var _utils = require("../../utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
-
-const schema = exports.schema = {
-  type: 'object'
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-const blockPageKeys = [...Object.keys(_pages.pageNameMap), ...Object.values(_pages.pageNameMap), ..._pages.supportedPages];
-let TenantHandler = (_dec = (0, _default.order)('100'), (_class = class TenantHandler extends _default2.default {
-  constructor(options) {
-    super({ ...options,
-      type: 'tenant'
-    });
-  }
-
-  async getType() {
-    const tenant = await this.client.tenant.getSettings();
-    blockPageKeys.forEach(key => {
-      if (tenant[key]) delete tenant[key];
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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());
     });
-    return tenant;
-  }
-
-  async validate(assets) {
-    const {
-      tenant
-    } = assets;
-    if (!tenant) return;
-    const pageKeys = Object.keys(tenant).filter(k => blockPageKeys.includes(k));
-
-    if (pageKeys.length > 0) {
-      throw new _ValidationError2.default(`The following pages ${(0, _utils.dumpJSON)(pageKeys)} were found in tenant settings. Pages should be set separately. Please refer to the documentation.`);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schema = void 0;
+const ValidationError_1 = __importDefault(require("../../ValidationError"));
+const default_1 = __importStar(require("./default"));
+const pages_1 = require("./pages");
+const utils_1 = require("../../utils");
+exports.schema = {
+    type: 'object'
+};
+const blockPageKeys = [...Object.keys(pages_1.pageNameMap), ...Object.values(pages_1.pageNameMap), ...pages_1.supportedPages];
+class TenantHandler extends default_1.default {
+    constructor(options) {
+        super(Object.assign(Object.assign({}, options), { type: 'tenant' }));
+    }
+    getType() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tenant = yield this.client.tenant.getSettings();
+            blockPageKeys.forEach((key) => {
+                if (tenant[key])
+                    delete tenant[key];
+            });
+            return tenant;
+        });
+    }
+    validate(assets) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { tenant } = assets;
+            // Nothing to validate?
+            if (!tenant)
+                return;
+            const pageKeys = Object.keys(tenant).filter((k) => blockPageKeys.includes(k));
+            if (pageKeys.length > 0) {
+                throw new ValidationError_1.default(`The following pages ${(0, utils_1.dumpJSON)(pageKeys)} were found in tenant settings. Pages should be set separately. Please refer to the documentation.`);
+            }
+        });
     }
-  }
-
-  async processChanges(assets) {
-    const {
-      tenant
-    } = assets;
-
-    if (tenant && Object.keys(tenant).length > 0) {
-      await this.client.tenant.updateSettings(tenant);
-      this.updated += 1;
-      this.didUpdate(tenant);
+    // Run after other updates so objected can be referenced such as default directory
+    processChanges(assets) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { tenant } = assets;
+            if (tenant && Object.keys(tenant).length > 0) {
+                yield this.client.tenant.updateSettings(tenant);
+                this.updated += 1;
+                this.didUpdate(tenant);
+            }
+        });
     }
-  }
-
-}, (_applyDecoratedDescriptor(_class.prototype, "processChanges", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "processChanges"), _class.prototype)), _class));
-exports.default = TenantHandler;
+}
+__decorate([
+    (0, default_1.order)('100')
+], TenantHandler.prototype, "processChanges", null);
+exports.default = TenantHandler;