auth0-deploy-cli 7.5.2 → 7.7.1

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

@@ -44,7 +44,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const default_1 = __importStar(require("./default"));
-const utils_1 = require("../../utils");
+const calculateChanges_1 = require("../../calculateChanges");
 const logger_1 = __importDefault(require("../../logger"));
 exports.schema = {
     type: 'array',
@@ -61,13 +61,13 @@ exports.schema = {
                     type: 'object',
                     properties: {
                         connection_id: { type: 'string' },
-                        assign_membership_on_login: { type: 'boolean' }
-                    }
-                }
-            }
+                        assign_membership_on_login: { type: 'boolean' },
+                    },
+                },
+            },
         },
-        required: ['name']
-    }
+        required: ['name'],
+    },
 };
 class OrganizationsHandler extends default_1.default {
     constructor(config) {
@@ -80,16 +80,21 @@ class OrganizationsHandler extends default_1.default {
     }
     deleteOrganizations(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.config('AUTH0_ALLOW_DELETE') === 'true' || this.config('AUTH0_ALLOW_DELETE') === true) {
-                yield this.client.pool.addEachTask({
+            if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
+                this.config('AUTH0_ALLOW_DELETE') === true) {
+                yield this.client.pool
+                    .addEachTask({
                     data: data || [],
-                    generator: (item) => this.deleteOrganization(item).then(() => {
+                    generator: (item) => this.deleteOrganization(item)
+                        .then(() => {
                         this.didDelete(item);
                         this.deleted += 1;
-                    }).catch((err) => {
-                        throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
                     })
-                }).promise();
+                        .catch((err) => {
+                        throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
+                    }),
+                })
+                    .promise();
             }
             else {
                 logger_1.default.warn(`Detected the following organizations should be deleted. Doing so may be destructive.\nYou can enable deletes by setting 'AUTH0_ALLOW_DELETE' to true in the config
@@ -110,15 +115,19 @@ class OrganizationsHandler extends default_1.default {
     }
     createOrganizations(creates) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.pool.addEachTask({
+            yield this.client.pool
+                .addEachTask({
                 data: creates || [],
-                generator: (item) => this.createOrganization(item).then((data) => {
+                generator: (item) => this.createOrganization(item)
+                    .then((data) => {
                     this.didCreate(data);
                     this.created += 1;
-                }).catch((err) => {
-                    throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
                 })
-            }).promise();
+                    .catch((err) => {
+                    throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
+                }),
+            })
+                .promise();
         });
     }
     updateOrganization(org, organizations) {
@@ -132,7 +141,8 @@ class OrganizationsHandler extends default_1.default {
             yield this.client.organizations.update(params, org);
             const connectionsToRemove = existingConnections.filter((c) => !connections.find((x) => x.connection_id === c.connection_id));
             const connectionsToAdd = connections.filter((c) => !existingConnections.find((x) => x.connection_id === c.connection_id));
-            const connectionsToUpdate = connections.filter((c) => existingConnections.find((x) => x.connection_id === c.connection_id && x.assign_membership_on_login !== c.assign_membership_on_login));
+            const connectionsToUpdate = connections.filter((c) => existingConnections.find((x) => x.connection_id === c.connection_id &&
+                x.assign_membership_on_login !== c.assign_membership_on_login));
             // Handle updates first
             yield Promise.all(connectionsToUpdate.map((conn) => this.client.organizations
                 .updateEnabledConnection(Object.assign({ connection_id: conn.connection_id }, params), { assign_membership_on_login: conn.assign_membership_on_login })
@@ -154,15 +164,19 @@ class OrganizationsHandler extends default_1.default {
     }
     updateOrganizations(updates, orgs) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.pool.addEachTask({
+            yield this.client.pool
+                .addEachTask({
                 data: updates || [],
-                generator: (item) => this.updateOrganization(item, orgs).then((data) => {
+                generator: (item) => this.updateOrganization(item, orgs)
+                    .then((data) => {
                     this.didUpdate(data);
                     this.updated += 1;
-                }).catch((err) => {
-                    throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
                 })
-            }).promise();
+                    .catch((err) => {
+                    throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
+                }),
+            })
+                .promise();
         });
     }
     getType() {
@@ -174,9 +188,14 @@ class OrganizationsHandler extends default_1.default {
                 return [];
             }
             try {
-                const organizations = yield this.client.organizations.getAll({ checkpoint: true, include_totals: true });
+                const organizations = yield this.client.organizations.getAll({
+                    checkpoint: true,
+                    include_totals: true,
+                });
                 for (let index = 0; index < organizations.length; index++) {
-                    const connections = yield this.client.organizations.connections.get({ id: organizations[index].id });
+                    const connections = yield this.client.organizations.connections.get({
+                        id: organizations[index].id,
+                    });
                     organizations[index].connections = connections;
                 }
                 this.existing = organizations;
@@ -199,18 +218,33 @@ class OrganizationsHandler extends default_1.default {
                 return;
             // Gets organizations from destination tenant
             const existing = yield this.getType();
-            const existingConnections = yield this.client.connections.getAll({ paginate: true, include_totals: true });
+            const existingConnections = yield this.client.connections.getAll({
+                paginate: true,
+                include_totals: true,
+            });
             // We need to get the connection ids for the names configured so we can link them together
             organizations.forEach((org) => {
-                org.connections = (org.connections || []).map((connection) => {
+                org.connections = (org.connections || [])
+                    .map((connection) => {
                     const { name } = connection;
                     delete connection.name;
                     return Object.assign(Object.assign({}, connection), { connection_id: (existingConnections.find((c) => c.name === name) || {}).id });
-                }).filter((connection) => !!connection.connection_id);
+                })
+                    .filter((connection) => !!connection.connection_id);
+            });
+            const changes = (0, calculateChanges_1.calculateChanges)({
+                handler: this,
+                assets: organizations,
+                existing,
+                identifiers: ['id', 'name'],
+                allowDelete: false, //TODO: actually pass in correct allowDelete value
             });
-            const changes = (0, utils_1.calcChanges)(this, organizations, existing, ['id', 'name']);
             logger_1.default.debug(`Start processChanges for organizations [delete:${changes.del.length}] [update:${changes.update.length}], [create:${changes.create.length}]`);
-            const myChanges = [{ del: changes.del }, { create: changes.create }, { update: changes.update }];
+            const myChanges = [
+                { del: changes.del },
+                { create: changes.create },
+                { update: changes.update },
+            ];
             yield Promise.all(myChanges.map((change) => __awaiter(this, void 0, void 0, function* () {
                 switch (true) {
                     case change.del && change.del.length > 0:
@@ -220,7 +254,8 @@ class OrganizationsHandler extends default_1.default {
                         yield this.createOrganizations(changes.create);
                         break;
                     case change.update && change.update.length > 0:
-                        yield this.updateOrganizations(change.update, existing);
+                        if (change.update)
+                            yield this.updateOrganizations(change.update, existing);
                         break;
                     default:
                         break;

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

@@ -15,13 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.pageNameMap = exports.supportedPages = void 0;
 const default_1 = __importDefault(require("./default"));
 const constants_1 = __importDefault(require("../../constants"));
-exports.supportedPages = constants_1.default.PAGE_NAMES
-    .filter((p) => p.includes('.json'))
-    .map((p) => p.replace('.json', ''));
+exports.supportedPages = constants_1.default.PAGE_NAMES.filter((p) => p.includes('.json')).map((p) => p.replace('.json', ''));
 exports.pageNameMap = {
     guardian_multifactor: 'guardian_mfa_page',
     password_reset: 'change_password',
-    error_page: 'error_page'
+    error_page: 'error_page',
 };
 // With this schema, we can only validate property types but not valid properties on per type basis
 exports.schema = {
@@ -33,12 +31,12 @@ exports.schema = {
             html: { type: 'string', default: '' },
             url: { type: 'string' },
             show_log_link: { type: 'boolean' },
-            enabled: { type: 'boolean' }
+            enabled: { type: 'boolean' },
         },
-        required: ['name']
-    }
+        required: ['name'],
+    },
 };
-class PageHandler extends default_1.default {
+class PagesHandler extends default_1.default {
     constructor(options) {
         super(Object.assign(Object.assign({}, options), { type: 'pages' }));
     }
@@ -47,13 +45,17 @@ class PageHandler extends default_1.default {
     }
     updateLoginPage(page) {
         return __awaiter(this, void 0, void 0, function* () {
-            const globalClient = yield this.client.clients.getAll({ is_global: true, paginate: true, include_totals: true });
+            const globalClient = yield this.client.clients.getAll({
+                is_global: true,
+                paginate: true,
+                include_totals: true,
+            });
             if (!globalClient[0]) {
                 throw new Error('Unable to find global client id when trying to update the login page');
             }
             yield this.client.clients.update({ client_id: globalClient[0].client_id }, {
                 custom_login_page: page.html,
-                custom_login_page_on: page.enabled
+                custom_login_page_on: page.enabled,
             });
             this.updated += 1;
             this.didUpdate(page);
@@ -86,7 +88,11 @@ class PageHandler extends default_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const pages = [];
             // Login page is handled via the global client
-            const globalClient = yield this.client.clients.getAll({ is_global: true, paginate: true, include_totals: true });
+            const globalClient = yield this.client.clients.getAll({
+                is_global: true,
+                paginate: true,
+                include_totals: true,
+            });
             if (!globalClient[0]) {
                 throw new Error('Unable to find global client id when trying to dump the login page');
             }
@@ -94,7 +100,7 @@ class PageHandler extends default_1.default {
                 pages.push({
                     name: 'login',
                     enabled: globalClient[0].custom_login_page_on,
-                    html: globalClient[0].custom_login_page
+                    html: globalClient[0].custom_login_page,
                 });
             }
             const tenantSettings = yield this.client.tenant.getSettings();
@@ -115,7 +121,7 @@ class PageHandler extends default_1.default {
                 return;
             // Login page is handled via the global client
             const loginPage = pages.find((p) => p.name === 'login');
-            if (loginPage) {
+            if (loginPage !== undefined) {
                 yield this.updateLoginPage(loginPage);
             }
             // Rest of pages are on tenant level settings
@@ -123,4 +129,4 @@ class PageHandler extends default_1.default {
         });
     }
 }
-exports.default = PageHandler;
+exports.default = PagesHandler;

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

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = void 0;
+//@ts-nocheck because prompts haven't been fully implemented in this codebase yet
 const default_1 = __importDefault(require("./default"));
 exports.schema = { type: 'object' };
 class PromptsHandler extends default_1.default {

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

@@ -13,13 +13,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.excludeSchema = void 0;
-const ValidationError_1 = __importDefault(require("../../ValidationError"));
+const validationError_1 = __importDefault(require("../../validationError"));
 const constants_1 = __importDefault(require("../../constants"));
 const default_1 = __importDefault(require("./default"));
-const utils_1 = require("../../utils");
+const calculateChanges_1 = require("../../calculateChanges");
 exports.excludeSchema = {
     type: 'array',
-    items: { type: 'string' }
+    items: { type: 'string' },
 };
 exports.schema = {
     type: 'array',
@@ -34,20 +34,19 @@ exports.schema = {
                     type: 'object',
                     properties: {
                         name: { type: 'string' },
-                        description: { type: 'string' }
-                    }
-                }
+                        description: { type: 'string' },
+                    },
+                },
             },
             enforce_policies: { type: 'boolean' },
-            token_dialect: { type: 'string' }
+            token_dialect: { type: 'string' },
         },
-        required: ['name', 'identifier']
-    }
+        required: ['name', 'identifier'],
+    },
 };
 class ResourceServersHandler extends default_1.default {
     constructor(options) {
-        super(Object.assign(Object.assign({}, options), { type: 'resourceServers', stripUpdateFields: ['identifier'] // Fields not allowed in updates
-         }));
+        super(Object.assign(Object.assign({}, options), { type: 'resourceServers', stripUpdateFields: ['identifier'] }));
     }
     objString(resourceServer) {
         return super.objString({ name: resourceServer.name, identifier: resourceServer.identifier });
@@ -56,7 +55,10 @@ class ResourceServersHandler extends default_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.existing)
                 return this.existing;
-            const resourceServers = yield this.client.resourceServers.getAll({ paginate: true, include_totals: true });
+            const resourceServers = yield this.client.resourceServers.getAll({
+                paginate: true,
+                include_totals: true,
+            });
             return resourceServers.filter((rs) => rs.name !== constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME);
         });
     }
@@ -65,13 +67,24 @@ class ResourceServersHandler extends default_1.default {
             let { resourceServers } = assets;
             // Do nothing if not set
             if (!resourceServers)
-                return {};
+                return {
+                    del: [],
+                    create: [],
+                    conflicts: [],
+                    update: [],
+                };
             const excluded = (assets.exclude && assets.exclude.resourceServers) || [];
             let existing = yield this.getType();
             // Filter excluded
             resourceServers = resourceServers.filter((r) => !excluded.includes(r.name));
             existing = existing.filter((r) => !excluded.includes(r.name));
-            return (0, utils_1.calcChanges)(this, resourceServers, existing, ['id', 'identifier']);
+            return (0, calculateChanges_1.calculateChanges)({
+                handler: this,
+                assets: resourceServers,
+                existing,
+                identifiers: ['id', 'identifier'],
+                allowDelete: false, //TODO: actually pass in correct allowDelete value
+            });
         });
     }
     validate(assets) {
@@ -85,7 +98,7 @@ class ResourceServersHandler extends default_1.default {
                 return;
             const mgmtAPIResource = resourceServers.find((r) => r.name === constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME);
             if (mgmtAPIResource) {
-                throw new ValidationError_1.default(`You can not configure the '${constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME}'.`);
+                throw new validationError_1.default(`You can not configure the '${constants_1.default.RESOURCE_SERVERS_MANAGEMENT_API_NAME}'.`);
             }
             yield _super.validate.call(this, assets);
         });

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

@@ -43,7 +43,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = void 0;
 const default_1 = __importStar(require("./default"));
-const utils_1 = require("../../utils");
+const calculateChanges_1 = require("../../calculateChanges");
 const logger_1 = __importDefault(require("../../logger"));
 exports.schema = {
     type: 'array',
@@ -59,15 +59,15 @@ exports.schema = {
                     type: 'object',
                     properties: {
                         permission_name: { type: 'string' },
-                        resource_server_identifier: { type: 'string' }
-                    }
-                }
-            }
+                        resource_server_identifier: { type: 'string' },
+                    },
+                },
+            },
         },
-        required: ['name']
-    }
+        required: ['name'],
+    },
 };
-class RoleHandler extends default_1.default {
+class RolesHandler extends default_1.default {
     constructor(config) {
         super(Object.assign(Object.assign({}, config), { type: 'roles', id: 'id', identifiers: ['name'] }));
     }
@@ -84,15 +84,19 @@ class RoleHandler extends default_1.default {
     }
     createRoles(creates) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.pool.addEachTask({
+            yield this.client.pool
+                .addEachTask({
                 data: creates || [],
-                generator: (item) => this.createRole(item).then((data) => {
+                generator: (item) => this.createRole(item)
+                    .then((data) => {
                     this.didCreate(data);
                     this.created += 1;
-                }).catch((err) => {
-                    throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
                 })
-            }).promise();
+                    .catch((err) => {
+                    throw new Error(`Problem creating ${this.type} ${this.objString(item)}\n${err}`);
+                }),
+            })
+                .promise();
         });
     }
     deleteRole(data) {
@@ -102,16 +106,21 @@ class RoleHandler extends default_1.default {
     }
     deleteRoles(dels) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.config('AUTH0_ALLOW_DELETE') === 'true' || this.config('AUTH0_ALLOW_DELETE') === true) {
-                yield this.client.pool.addEachTask({
+            if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
+                this.config('AUTH0_ALLOW_DELETE') === true) {
+                yield this.client.pool
+                    .addEachTask({
                     data: dels || [],
-                    generator: (item) => this.deleteRole(item).then(() => {
+                    generator: (item) => this.deleteRole(item)
+                        .then(() => {
                         this.didDelete(item);
                         this.deleted += 1;
-                    }).catch((err) => {
-                        throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
                     })
-                }).promise();
+                        .catch((err) => {
+                        throw new Error(`Problem deleting ${this.type} ${this.objString(item)}\n${err}`);
+                    }),
+                })
+                    .promise();
             }
             else {
                 logger_1.default.warn(`Detected the following roles should be deleted. Doing so may be destructive.\nYou can enable deletes by setting 'AUTH0_ALLOW_DELETE' to true in the config
@@ -138,15 +147,19 @@ class RoleHandler extends default_1.default {
     }
     updateRoles(updates, roles) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.client.pool.addEachTask({
+            yield this.client.pool
+                .addEachTask({
                 data: updates || [],
-                generator: (item) => this.updateRole(item, roles).then((data) => {
+                generator: (item) => this.updateRole(item, roles)
+                    .then((data) => {
                     this.didUpdate(data);
                     this.updated += 1;
-                }).catch((err) => {
-                    throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
                 })
-            }).promise();
+                    .catch((err) => {
+                    throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
+                }),
+            })
+                .promise();
         });
     }
     getType() {
@@ -161,7 +174,11 @@ class RoleHandler extends default_1.default {
             try {
                 const roles = yield this.client.roles.getAll({ paginate: true, include_totals: true });
                 for (let index = 0; index < roles.length; index++) {
-                    const permissions = yield this.client.roles.permissions.getAll({ paginate: true, include_totals: true, id: roles[index].id });
+                    const permissions = yield this.client.roles.permissions.getAll({
+                        paginate: true,
+                        include_totals: true,
+                        id: roles[index].id,
+                    });
                     const strippedPerms = yield Promise.all(permissions.map((permission) => __awaiter(this, void 0, void 0, function* () {
                         delete permission.resource_server_name;
                         delete permission.description;
@@ -188,19 +205,31 @@ class RoleHandler extends default_1.default {
                 return;
             // Gets roles from destination tenant
             const existing = yield this.getType();
-            const changes = (0, utils_1.calcChanges)(this, roles, existing, ['id', 'name']);
+            const changes = (0, calculateChanges_1.calculateChanges)({
+                handler: this,
+                assets: roles,
+                existing,
+                identifiers: ['id', 'name'],
+                allowDelete: false, //TODO: actually pass in correct allowDelete value
+            });
             logger_1.default.debug(`Start processChanges for roles [delete:${changes.del.length}] [update:${changes.update.length}], [create:${changes.create.length}]`);
-            const myChanges = [{ del: changes.del }, { create: changes.create }, { update: changes.update }];
+            const myChanges = [
+                { del: changes.del },
+                { create: changes.create },
+                { update: changes.update },
+            ];
             yield Promise.all(myChanges.map((change) => __awaiter(this, void 0, void 0, function* () {
                 switch (true) {
                     case change.del && change.del.length > 0:
-                        yield this.deleteRoles(change.del);
+                        if (change.del)
+                            yield this.deleteRoles(change.del);
                         break;
                     case change.create && change.create.length > 0:
-                        yield this.createRoles(changes.create);
+                        yield this.createRoles(changes.create); //TODO: fix this tho change.create
                         break;
                     case change.update && change.update.length > 0:
-                        yield this.updateRoles(change.update, existing);
+                        if (change.update)
+                            yield this.updateRoles(change.update, existing);
                         break;
                     default:
                         break;
@@ -211,5 +240,5 @@ class RoleHandler extends default_1.default {
 }
 __decorate([
     (0, default_1.order)('60')
-], RoleHandler.prototype, "processChanges", null);
-exports.default = RoleHandler;
+], RolesHandler.prototype, "processChanges", null);
+exports.default = RolesHandler;