auth0-deploy-cli 9.0.0-beta.2 → 9.1.0

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

@@ -1,10 +1,49 @@
 "use strict";
+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;
+});
+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;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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"));
+const default_1 = __importStar(require("./default"));
 const client_1 = require("../client");
 const logger_1 = __importDefault(require("../../../logger"));
 // Define action types
@@ -57,6 +96,15 @@ const RedirectAction = {
     },
     additionalProperties: false,
 };
+// Shared sub-schemas reused across every rule branch below.
+const ActionSchema = {
+    type: 'object',
+    anyOf: [BlockAction, AllowAction, LogAction, RedirectAction],
+};
+const ScopeSchema = {
+    enum: ['management', 'authentication', 'tenant'],
+    type: 'string',
+};
 // Define MatchSchema
 const MatchSchema = {
     type: 'object',
@@ -69,6 +117,15 @@ const MatchSchema = {
             uniqueItems: true,
             minItems: 1,
         },
+        auth0_managed: {
+            type: 'array',
+            items: {
+                type: 'string',
+                pattern: '^auth0\\.[^.\\s]+$',
+            },
+            uniqueItems: true,
+            minItems: 1,
+        },
         geo_country_codes: {
             type: 'array',
             items: {
@@ -146,6 +203,27 @@ const MatchSchema = {
             },
             uniqueItems: true,
         },
+        http_message_signature: {
+            type: 'object',
+            properties: {
+                keys: {
+                    type: 'array',
+                    minItems: 1,
+                    maxItems: 10,
+                    uniqueItems: true,
+                    items: {
+                        type: 'object',
+                        properties: {
+                            id: { type: 'string' },
+                        },
+                        required: ['id'],
+                        additionalProperties: false,
+                    },
+                },
+            },
+            required: ['keys'],
+            additionalProperties: false,
+        },
     },
     additionalProperties: false,
 };
@@ -173,16 +251,10 @@ exports.schema = {
                         type: 'object',
                         required: ['action', 'scope', 'match'],
                         properties: {
-                            action: {
-                                type: 'object',
-                                anyOf: [BlockAction, AllowAction, LogAction, RedirectAction],
-                            },
+                            action: ActionSchema,
                             match: MatchSchema,
                             not_match: MatchSchema,
-                            scope: {
-                                enum: ['management', 'authentication', 'tenant'],
-                                type: 'string',
-                            },
+                            scope: ScopeSchema,
                         },
                         additionalProperties: false,
                     },
@@ -190,16 +262,25 @@ exports.schema = {
                         type: 'object',
                         required: ['action', 'scope', 'not_match'],
                         properties: {
-                            action: {
-                                type: 'object',
-                                anyOf: [BlockAction, AllowAction, LogAction, RedirectAction],
-                            },
+                            action: ActionSchema,
                             not_match: MatchSchema,
                             match: MatchSchema,
-                            scope: {
-                                enum: ['management', 'authentication', 'tenant'],
-                                type: 'string',
+                            scope: ScopeSchema,
+                        },
+                        additionalProperties: false,
+                    },
+                    {
+                        // Unconditional match: `match_all` is mutually exclusive with `match`/`not_match`.
+                        type: 'object',
+                        required: ['action', 'scope', 'match_all'],
+                        properties: {
+                            action: ActionSchema,
+                            match_all: {
+                                // Schema only permits `true`; omit the property instead of sending `false`.
+                                type: 'boolean',
+                                enum: [true],
                             },
+                            scope: ScopeSchema,
                         },
                         additionalProperties: false,
                     },
@@ -346,3 +427,6 @@ class NetworkACLsHandler extends default_1.default {
     }
 }
 exports.default = NetworkACLsHandler;
+__decorate([
+    (0, default_1.order)(65)
+], NetworkACLsHandler.prototype, "processChanges", null);

package/lib/tools/auth0/handlers/organizations.d.ts

@@ -1,6 +1,7 @@
 import { Management } from 'auth0';
 import DefaultHandler from './default';
 import { Asset, Assets, CalculatedChanges } from '../../../types';
+import { Client } from './clients';
 export declare const schema: {
     type: string;
     items: {
@@ -104,6 +105,29 @@ export declare const schema: {
                     required: string[];
                 };
             };
+            third_party_client_access: {
+                type: string;
+                enum: ("allow" | "block")[];
+            };
+            is_app_entitlement_active: {
+                type: string;
+            };
+            clients: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        client_id: {
+                            type: string;
+                        };
+                        use_for_member_access: {
+                            type: string;
+                        };
+                    };
+                    required: string[];
+                };
+                default: never[];
+            };
         };
         required: string[];
     };
@@ -115,6 +139,7 @@ type FormattedClientGrants = {
 export default class OrganizationsHandler extends DefaultHandler {
     existing: Asset[];
     formattedClientGrants: FormattedClientGrants[];
+    allClients: Client[];
     constructor(config: DefaultHandler);
     deleteOrganization(org: any): Promise<void>;
     deleteOrganizations(data: Asset[]): Promise<void>;
@@ -122,8 +147,9 @@ export default class OrganizationsHandler extends DefaultHandler {
     createOrganizations(creates: CalculatedChanges['create']): Promise<void>;
     updateOrganization(org: any, organizations: any): Promise<{
         id: any;
-    }>;
+    } | null>;
     getClientGrantIDByClientName(clientsName: string): string;
+    getClientIdByClientName(clientName: string): string;
     getFormattedClientGrants(): Promise<FormattedClientGrants[]>;
     updateOrganizations(updates: CalculatedChanges['update'], orgs: Asset[]): Promise<void>;
     getType(): Promise<Asset[]>;
@@ -137,5 +163,11 @@ export default class OrganizationsHandler extends DefaultHandler {
     createOrganizationDiscoveryDomain(organizationId: string, discoveryDomain: Management.CreateOrganizationDiscoveryDomainRequestContent): Promise<Management.CreateOrganizationDiscoveryDomainResponseContent>;
     updateOrganizationDiscoveryDomain(organizationId: string, discoveryDomainId: string, discoveryDomain: string, discoveryDomainUpdate: Management.UpdateOrganizationDiscoveryDomainRequestContent): Promise<Management.UpdateOrganizationDiscoveryDomainResponseContent>;
     deleteOrganizationDiscoveryDomain(organizationId: string, discoveryDomain: string, discoveryDomainId: string): Promise<void>;
+    getAllOrganizationClients(organizationId: string): Promise<Management.OrganizationClient[] | null>;
+    createOrganizationClients(organizationId: string, clients: Array<{
+        client_id: string;
+        use_for_member_access: boolean;
+    }>): Promise<void>;
+    deleteOrganizationClients(organizationId: string, clientIds: string[]): Promise<void>;
 }
 export {};

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

@@ -51,6 +51,12 @@ const logger_1 = __importDefault(require("../../../logger"));
 const client_1 = require("../client");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../../utils");
+// Org sub-resources are skipped when the tenant can't read them: the EA feature is off
+// (feature_not_enabled, returned as 400 or 403) or the token lacks scope (403). The SDK
+// puts the API code on `err.body.errorCode`, not `err.errorCode`.
+function isOrgSubresourceUnavailable(err) {
+    return err?.statusCode === 403 || err?.body?.errorCode === 'feature_not_enabled';
+}
 exports.schema = {
     type: 'array',
     items: {
@@ -127,6 +133,23 @@ exports.schema = {
                     required: ['domain', 'status'],
                 },
             },
+            third_party_client_access: {
+                type: 'string',
+                enum: Object.values(auth0_1.Management.OrganizationThirdPartyClientAccessEnum),
+            },
+            is_app_entitlement_active: { type: 'boolean' },
+            clients: {
+                type: 'array',
+                items: {
+                    type: 'object',
+                    properties: {
+                        client_id: { type: 'string' },
+                        use_for_member_access: { type: 'boolean' },
+                    },
+                    required: ['client_id', 'use_for_member_access'],
+                },
+                default: [],
+            },
         },
         required: ['name'],
     },
@@ -168,6 +191,7 @@ class OrganizationsHandler extends default_1.default {
         const organization = { ...org };
         delete organization.connections;
         delete organization.client_grants;
+        delete organization.clients;
         if ('discovery_domains' in organization) {
             delete organization.discovery_domains;
         }
@@ -176,8 +200,9 @@ class OrganizationsHandler extends default_1.default {
             throw new Error(`Organization "${organization.name}" was created but the response did not include an ID. Skipping connection/grant association.`);
         }
         const createdId = created.id;
+        const retryConfig = this.getRetryConfig();
         if (typeof org.connections !== 'undefined' && org.connections.length > 0) {
-            await Promise.all(org.connections.map((conn) => this.client.organizations.connections.create(createdId, conn)));
+            await Promise.all(org.connections.map((conn) => (0, default_1.retryWithExponentialBackoff)(() => this.client.organizations.connections.create(createdId, conn), retryConfig)));
         }
         if (typeof org.client_grants !== 'undefined' && org.client_grants.length > 0) {
             await Promise.all(org.client_grants.map((organizationClientGrants) => this.createOrganizationClientGrants(createdId, this.getClientGrantIDByClientName(organizationClientGrants.client_id))));
@@ -191,6 +216,19 @@ class OrganizationsHandler extends default_1.default {
                 throw new Error(`Problem creating discovery domain ${discoveryDomain?.domain} for organization ${createdId}\n${err}`);
             })));
         }
+        if (typeof org.clients !== 'undefined' && org.clients.length > 0) {
+            const clientsToCreate = org.clients
+                .map((oc) => ({
+                client_id: this.getClientIdByClientName(oc.client_id),
+                use_for_member_access: oc.use_for_member_access,
+            }))
+                .filter((oc) => !!oc.client_id);
+            if (clientsToCreate.length > 0) {
+                await this.createOrganizationClients(createdId, clientsToCreate).catch((err) => {
+                    throw new Error(`Problem creating org clients for organization ${createdId}\n${err}`);
+                });
+            }
+        }
         return created;
     }
     async createOrganizations(creates) {
@@ -209,15 +247,24 @@ class OrganizationsHandler extends default_1.default {
             .promise();
     }
     async updateOrganization(org, organizations) {
-        const { connections: existingConnections, client_grants: existingClientGrants, discovery_domains: existingDiscoveryDomains, } = await organizations.find((orgToUpdate) => orgToUpdate.name === org.name);
+        const existingOrg = organizations.find((orgToUpdate) => orgToUpdate.name === org.name);
+        const { connections: existingConnections, client_grants: existingClientGrants, discovery_domains: existingDiscoveryDomains, clients: existingOrgClients = [], } = existingOrg;
         const params = { id: org.id };
-        const { connections, client_grants: organizationClientGrants, discovery_domains: organizationDiscoveryDomains, } = org;
+        const { connections, client_grants: organizationClientGrants, discovery_domains: organizationDiscoveryDomains, clients: organizationClients, } = org;
         delete org.connections;
         delete org.name;
         delete org.id;
         delete org.client_grants;
         delete org.discovery_domains;
-        await this.client.organizations.update(params.id, org);
+        delete org.clients;
+        // Only PATCH if top-level properties actually differ from the existing state.
+        // Compare only the keys present in the desired config against those same keys
+        // on the remote org, so that fields the user didn't specify are not considered.
+        let changed = false;
+        if (!(0, lodash_1.isEqual)(org, (0, lodash_1.pick)(existingOrg, Object.keys(org)))) {
+            await this.client.organizations.update(params.id, org);
+            changed = true;
+        }
         // organization connections
         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));
@@ -228,27 +275,27 @@ class OrganizationsHandler extends default_1.default {
                 x.organization_access_level !== c.organization_access_level ||
                 x.organization_connection_name !== c.organization_connection_name ||
                 x.is_enabled !== (c.is_enabled ?? true))));
+        if (connectionsToUpdate.length > 0 ||
+            connectionsToAdd.length > 0 ||
+            connectionsToRemove.length > 0) {
+            changed = true;
+        }
+        const retryConfig = this.getRetryConfig();
         // Handle updates first
-        await Promise.all(connectionsToUpdate.map((conn) => this.client.organizations.connections
-            .update(params.id, conn.connection_id, {
+        await Promise.all(connectionsToUpdate.map((conn) => (0, default_1.retryWithExponentialBackoff)(() => this.client.organizations.connections.update(params.id, conn.connection_id, {
             organization_connection_name: conn.organization_connection_name,
             assign_membership_on_login: conn.assign_membership_on_login,
             show_as_button: conn.show_as_button,
             is_signup_enabled: conn.is_signup_enabled,
             is_enabled: conn.is_enabled,
             organization_access_level: conn.organization_access_level,
-        })
-            .catch(() => {
+        }), retryConfig).catch(() => {
             throw new Error(`Problem updating Enabled Connection ${conn.connection_id} for organizations ${params.id}`);
         })));
-        await Promise.all(connectionsToAdd.map((conn) => this.client.organizations.connections
-            .create(params.id, (0, lodash_1.omit)(conn, 'connection'))
-            .catch(() => {
+        await Promise.all(connectionsToAdd.map((conn) => (0, default_1.retryWithExponentialBackoff)(() => this.client.organizations.connections.create(params.id, (0, lodash_1.omit)(conn, 'connection')), retryConfig).catch(() => {
             throw new Error(`Problem adding Enabled Connection ${conn.connection_id} for organizations ${params.id}`);
         })));
-        await Promise.all(connectionsToRemove.map((conn) => this.client.organizations.connections
-            .delete(params.id, conn.connection_id)
-            .catch(() => {
+        await Promise.all(connectionsToRemove.map((conn) => (0, default_1.retryWithExponentialBackoff)(() => this.client.organizations.connections.delete(params.id, conn.connection_id), retryConfig).catch(() => {
             throw new Error(`Problem removing Enabled Connection ${conn.connection_id} for organizations ${params.id}`);
         })));
         // organization client_grants
@@ -262,6 +309,9 @@ class OrganizationsHandler extends default_1.default {
             ?.map((clientGrant) => ({
             grant_id: this.getClientGrantIDByClientName(clientGrant.client_id),
         })) || [];
+        if (orgClientGrantsToAdd.length > 0 || orgClientGrantsToRemove.length > 0) {
+            changed = true;
+        }
         // Handle updates first
         await Promise.all(orgClientGrantsToAdd.map((orgClientGrant) => this.createOrganizationClientGrants(params.id, orgClientGrant.grant_id).catch(() => {
             throw new Error(`Problem adding organization clientGrant ${orgClientGrant.grant_id} for organizations ${params.id}`);
@@ -283,6 +333,9 @@ class OrganizationsHandler extends default_1.default {
             };
         })
             .filter(Boolean) || [];
+        if (orgDiscoveryDomainsToUpdate.length > 0 || orgDiscoveryDomainsToAdd.length > 0) {
+            changed = true;
+        }
         for (const { id, domain, ...updateParams } of orgDiscoveryDomainsToUpdate) {
             try {
                 await this.updateOrganizationDiscoveryDomain(params.id, id, domain, updateParams);
@@ -306,6 +359,7 @@ class OrganizationsHandler extends default_1.default {
         if (orgDiscoveryDomainsToRemove.length > 0) {
             if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
                 this.config('AUTH0_ALLOW_DELETE') === true) {
+                changed = true;
                 for (const domain of orgDiscoveryDomainsToRemove) {
                     try {
                         await this.deleteOrganizationDiscoveryDomain(params.id, domain.domain, domain.id);
@@ -320,12 +374,66 @@ class OrganizationsHandler extends default_1.default {
       \n${orgDiscoveryDomainsToRemove.map((i) => this.objString(i)).join('\n')}`);
             }
         }
-        return params;
+        // organization clients
+        const orgClientsToAdd = (organizationClients || [])
+            .filter((c) => !existingOrgClients.find((x) => x.client_id === c.client_id))
+            .map((oc) => ({
+            client_id: this.getClientIdByClientName(oc.client_id),
+            use_for_member_access: oc.use_for_member_access,
+        }))
+            .filter((oc) => !!oc.client_id);
+        const orgClientsToRemove = (existingOrgClients || [])
+            .filter((c) => !(organizationClients || []).find((x) => x.client_id === c.client_id))
+            .map((oc) => this.getClientIdByClientName(oc.client_id))
+            .filter(Boolean);
+        const orgClientsToUpdate = (organizationClients || [])
+            .filter((c) => {
+            const existing = existingOrgClients.find((x) => x.client_id === c.client_id);
+            return existing && existing.use_for_member_access !== c.use_for_member_access;
+        })
+            .map((oc) => ({
+            client_id: this.getClientIdByClientName(oc.client_id),
+            use_for_member_access: oc.use_for_member_access,
+        }))
+            .filter((oc) => !!oc.client_id);
+        if (orgClientsToAdd.length > 0) {
+            changed = true;
+            await this.createOrganizationClients(params.id, orgClientsToAdd).catch((err) => {
+                throw new Error(`Problem adding org clients for organization ${params.id}\n${err}`);
+            });
+        }
+        if (orgClientsToRemove.length > 0) {
+            if (this.config('AUTH0_ALLOW_DELETE') === 'true' ||
+                this.config('AUTH0_ALLOW_DELETE') === true) {
+                changed = true;
+                await this.deleteOrganizationClients(params.id, orgClientsToRemove).catch((err) => {
+                    throw new Error(`Problem removing org clients for organization ${params.id}\n${err}`);
+                });
+            }
+            else {
+                logger_1.default.warn(`Detected the following organization client associations should be removed. Doing so may be destructive.\nYou can enable deletes by setting 'AUTH0_ALLOW_DELETE' to true in the config\n${orgClientsToRemove.join('\n')}`);
+            }
+        }
+        if (orgClientsToUpdate.length > 0) {
+            changed = true;
+        }
+        await Promise.all(orgClientsToUpdate.map((oc) => this.client.organizations.clients
+            .update(params.id, oc.client_id, {
+            use_for_member_access: oc.use_for_member_access,
+        })
+            .catch((err) => {
+            throw new Error(`Problem updating org client ${oc.client_id} for organization ${params.id}\n${err}`);
+        })));
+        return changed ? params : null;
     }
     getClientGrantIDByClientName(clientsName) {
         const found = this.formattedClientGrants.find((c) => c.client_id === clientsName);
         return found?.grant_id || '';
     }
+    getClientIdByClientName(clientName) {
+        const found = this.allClients?.find((c) => c.name === clientName);
+        return found?.client_id || '';
+    }
     async getFormattedClientGrants() {
         const [clients, clientGrants] = await Promise.all([
             (0, client_1.paginate)(this.client.clients.list, {
@@ -335,6 +443,8 @@ class OrganizationsHandler extends default_1.default {
                 paginate: true,
             }),
         ]);
+        // Store clients for org-client name→ID resolution
+        this.allClients = clients;
         // Convert clients by name to the id and store it in the formattedClientGrants
         const formattedClientGrantsMapping = clientGrants?.map((clientGrant) => {
             const { id, client_id: clientName } = clientGrant;
@@ -352,8 +462,10 @@ class OrganizationsHandler extends default_1.default {
             data: updates || [],
             generator: (item) => this.updateOrganization(item, orgs)
                 .then((data) => {
-                this.didUpdate(data);
-                this.updated += 1;
+                if (data) {
+                    this.didUpdate(data);
+                    this.updated += 1;
+                }
             })
                 .catch((err) => {
                 throw new Error(`Problem updating ${this.type} ${this.objString(item)}\n${err}`);
@@ -390,6 +502,14 @@ class OrganizationsHandler extends default_1.default {
                 if (organizationDiscoveryDomains) {
                     org.discovery_domains = organizationDiscoveryDomains;
                 }
+                // Get org-client associations
+                const orgClients = await this.getAllOrganizationClients(org.id);
+                if (orgClients) {
+                    org.clients = orgClients.map((oc) => ({
+                        client_id: (0, utils_1.convertClientIdToName)(oc.client_id, clients),
+                        use_for_member_access: oc.use_for_member_access,
+                    }));
+                }
             }
             this.existing = organizations;
             return this.existing;
@@ -504,8 +624,8 @@ class OrganizationsHandler extends default_1.default {
             if (err.statusCode === 404 || err.statusCode === 501) {
                 return null;
             }
-            if (err.statusCode === 403 || err.errorCode === 'feature_not_enabled') {
-                logger_1.default.debug('Organization Discovery domains are not enabled for this tenant. Please verify `scope` or contact Auth0 support to enable this feature.');
+            if (isOrgSubresourceUnavailable(err)) {
+                logger_1.default.debug(`Skipping organization discovery domains (${err?.body?.errorCode ?? err.statusCode}).`);
                 return null;
             }
             throw err;
@@ -535,6 +655,44 @@ class OrganizationsHandler extends default_1.default {
         logger_1.default.debug(`Deleting discovery domain ${discoveryDomain} for organization ${organizationId}`);
         await this.client.organizations.discoveryDomains.delete(organizationId, discoveryDomainId);
     }
+    async getAllOrganizationClients(organizationId) {
+        const allOrgClients = [];
+        try {
+            let orgClients = await this.client.organizations.clients.list(organizationId);
+            allOrgClients.push(...orgClients.data);
+            while (orgClients.hasNextPage()) {
+                orgClients = await orgClients.getNextPage();
+                allOrgClients.push(...orgClients.data);
+            }
+            return allOrgClients;
+        }
+        catch (err) {
+            if (err.statusCode === 404 || err.statusCode === 501) {
+                return null;
+            }
+            if (isOrgSubresourceUnavailable(err)) {
+                logger_1.default.debug(`Skipping org-client associations (${err?.body?.errorCode ?? err.statusCode}).`);
+                return null;
+            }
+            throw err;
+        }
+    }
+    async createOrganizationClients(organizationId, clients) {
+        const BATCH_SIZE = 10;
+        for (let i = 0; i < clients.length; i += BATCH_SIZE) {
+            const batch = clients.slice(i, i + BATCH_SIZE);
+            logger_1.default.debug(`Creating ${batch.length} org client(s) for organization ${organizationId}`);
+            await this.client.organizations.clients.create(organizationId, { clients: batch });
+        }
+    }
+    async deleteOrganizationClients(organizationId, clientIds) {
+        const BATCH_SIZE = 10;
+        for (let i = 0; i < clientIds.length; i += BATCH_SIZE) {
+            const batch = clientIds.slice(i, i + BATCH_SIZE);
+            logger_1.default.debug(`Deleting ${batch.length} org client(s) for organization ${organizationId}`);
+            await this.client.organizations.clients.delete(organizationId, { clients: batch });
+        }
+    }
 }
 exports.default = OrganizationsHandler;
 __decorate([

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

@@ -202,12 +202,20 @@ class PhoneProviderHandler extends default_1.default {
         }
         const currentProviders = await this.getPhoneProviders();
         const providerReqPayload = (() => {
+            // Work on a shallow copy so we don't mutate the caller's asset (phoneProviders[0]).
+            // The SDK response type doesn't declare `credentials`, so widen it here.
+            const payload = { ...phoneProviders[0] };
             // Removing id from update and create payloads, otherwise API will error
             // id may be required to handle if `--export_ids=true`
-            const payload = phoneProviders[0];
-            if (payload && 'id' in payload) {
+            if ('id' in payload) {
                 delete payload.id;
             }
+            // The `custom` provider requires a `credentials` object in the payload even
+            // when it is empty. Exported configs omit credentials, so inject an empty
+            // object here to avoid a "Missing required property: credentials" 400 error.
+            if (payload.name === 'custom' && payload.credentials == null) {
+                payload.credentials = {};
+            }
             return payload;
         })();
         if (currentProviders === null || currentProviders.length === 0) {

package/lib/tools/auth0/handlers/phoneTemplates.d.ts

@@ -54,7 +54,10 @@ export default class PhoneTemplatesHandler extends DefaultHandler {
     objString(template: any): string;
     getType(): Promise<PhoneTemplate[]>;
     processChanges(assets: Assets): Promise<void>;
-    createPhoneTemplate(template: any): Promise<Asset>;
+    createPhoneTemplate(template: any): Promise<{
+        asset: Asset;
+        action: 'create' | 'update';
+    }>;
     createPhoneTemplates(creates: CalculatedChanges['create']): Promise<void>;
     updatePhoneTemplate(template: any): Promise<Asset>;
     updatePhoneTemplates(updates: CalculatedChanges['update']): Promise<void>;