@pnp/cli-microsoft365 8.1.0-beta.3dec9fa → 9.0.0-beta.1cfb646

package/dist/m365/connection/commands/connection-use.js

@@ -3,10 +3,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ConnectionUseCommand_instances, _ConnectionUseCommand_initOptions;
+var _ConnectionUseCommand_instances, _ConnectionUseCommand_initTelemetry, _ConnectionUseCommand_initOptions, _ConnectionUseCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
+import { formatting } from '../../../utils/formatting.js';
+import { cli } from '../../../cli/cli.js';
 class ConnectionUseCommand extends Command {
     get name() {
         return commands.USE;
@@ -18,9 +20,20 @@ class ConnectionUseCommand extends Command {
         super();
         _ConnectionUseCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const connection = await auth.getConnection(args.options.name);
+        let connection;
+        if (args.options.name) {
+            connection = await auth.getConnection(args.options.name);
+        }
+        else {
+            const connections = await auth.getAllConnections();
+            connections.sort((a, b) => a.name.localeCompare(b.name));
+            const keyValuePair = formatting.convertArrayToHashTable('name', connections);
+            connection = await cli.handleMultipleResultsFound('Please select the connection you want to activate.', keyValuePair);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Switching to connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
         }
@@ -42,10 +55,18 @@ class ConnectionUseCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
+_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initTelemetry = function _ConnectionUseCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
     });
+}, _ConnectionUseCommand_initTypes = function _ConnectionUseCommand_initTypes() {
+    this.types.string.push('name');
 };
 export default new ConnectionUseCommand();
 //# sourceMappingURL=connection-use.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-add.js

@@ -30,12 +30,12 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptionSets).call(this);
     }
     async getAppId(args) {
-        if (args.options.appId) {
-            return args.options.appId;
+        if (args.options.id) {
+            return args.options.id;
         }
         let spMatchQuery = '';
-        if (args.options.appName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
         else if (args.options.objectId) {
             spMatchQuery = `id eq '${formatting.encodeQueryParameter(args.options.objectId)}'`;
@@ -54,7 +54,7 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.appId;
         }
         return spItem.appId;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
 _EntraEnterpriseAppAddCommand_instances = new WeakSet(), _EntraEnterpriseAppAddCommand_initTelemetry = function _EntraEnterpriseAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appName: (!(!args.options.appName)).toString(),
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
             objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppAddCommand_initOptions = function _EntraEnterpriseAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '--appName [appName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppAddCommand_initValidators = function _EntraEnterpriseAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppAddCommand_initOptionSets = function _EntraEnterpriseAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appName', 'objectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppAddCommand();
 //# sourceMappingURL=enterpriseapp-add.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-get.js

@@ -30,15 +30,15 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
     }
     async getSpId(args) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
+        if (args.options.objectId) {
+            return args.options.objectId;
         }
         let spMatchQuery = '';
-        if (args.options.appDisplayName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
-        else if (args.options.appId) {
-            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.appId)}'`;
+        else if (args.options.id) {
+            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.id)}'`;
         }
         const idRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
@@ -54,7 +54,7 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
 _EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appDisplayName: (!(!args.options.appDisplayName)).toString(),
-            appObjectId: (!(!args.options.appObjectId)).toString()
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
+            objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --appDisplayName [appDisplayName]'
+        option: '-n, --displayName [displayName]'
     }, {
-        option: '--appObjectId [appObjectId]'
+        option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppGetCommand_initValidators = function _EntraEnterpriseAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid objectId GUID`;
+        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppGetCommand();
 //# sourceMappingURL=enterpriseapp-get.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-list.js

@@ -61,7 +61,7 @@ _EntraEnterpriseAppListCommand_instances = new WeakSet(), _EntraEnterpriseAppLis
     });
 }, _EntraEnterpriseAppListCommand_initOptions = function _EntraEnterpriseAppListCommand_initOptions() {
     this.options.unshift({
-        option: '--displayName [displayName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--tag [tag]'
     });

package/dist/m365/entra/commands/group/group-user-list.js

@@ -65,7 +65,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;
@@ -111,7 +111,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             properties: typeof args.options.properties !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -121,7 +121,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
+        option: "-n, --groupName [groupName]"
     }, {
         option: "-r, --role [role]",
         autocomplete: ["Owner", "Member"]
@@ -132,7 +132,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     });
 }, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['groupId', 'groupDisplayName']
+        options: ['groupId', 'groupName']
     });
 }, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.js

@@ -51,7 +51,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
         return group.id;
     }
 }
@@ -59,14 +59,14 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined'
         });
     });
 }, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-t, --threadId <threadId>'
     });
@@ -78,7 +78,7 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
         return true;
     });
 }, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
 };
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-list.js

@@ -32,7 +32,7 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_RECYCLEBINITEM_LIST, commands.M365GROUP_RECYCLEBINITEM_LIST);
         try {
             const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.groupName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupName).replace(/'/g, `''`)}')` : '';
             const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
             const topCount = '&$top=100';
             const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
@@ -47,13 +47,13 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
 _EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });

package/dist/m365/entra/commands/m365group/m365group-user-list.js

@@ -31,9 +31,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
-            if (args.options.role === 'Guest') {
-                await this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
-            }
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
@@ -42,9 +39,9 @@ class EntraM365GroupUserListCommand extends GraphCommand {
             let users = [];
             if (!args.options.role || args.options.role === 'Owner') {
                 const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
-                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
             }
-            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+            if (!args.options.role || args.options.role === 'Member') {
                 const members = await this.getUsers(args.options, 'Members', groupId, logger);
                 members.forEach((member) => {
                     const user = users.find((u) => u.id === member.id);
@@ -57,7 +54,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 });
             }
             if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.roles.indexOf(args.options.role) > -1);
             }
             await logger.log(users);
         }
@@ -128,7 +125,7 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
         option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member", "Guest"]
+        autocomplete: ["Owner", "Member"]
     }, {
         option: "-p, --properties [properties]"
     }, {
@@ -144,8 +141,8 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {
-            if (['Owner', 'Member', 'Guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member|Guest`;
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
             }
         }
         return true;

package/dist/m365/entra/commands/multitenant/multitenant-add.js

@@ -0,0 +1,65 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EntraMultitenantAddCommand_instances, _EntraMultitenantAddCommand_initTelemetry, _EntraMultitenantAddCommand_initOptions, _EntraMultitenantAddCommand_initTypes;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantAddCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_ADD;
+    }
+    get description() {
+        return 'Creates a new multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Creating multitenant organization...');
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName
+            }
+        };
+        try {
+            const multitenantOrg = await request.put(requestOptions);
+            await logger.log(multitenantOrg);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraMultitenantAddCommand_instances = new WeakSet(), _EntraMultitenantAddCommand_initTelemetry = function _EntraMultitenantAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _EntraMultitenantAddCommand_initOptions = function _EntraMultitenantAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _EntraMultitenantAddCommand_initTypes = function _EntraMultitenantAddCommand_initTypes() {
+    this.types.string.push('displayName', 'description');
+};
+export default new EntraMultitenantAddCommand();
+//# sourceMappingURL=multitenant-add.js.map

package/dist/m365/entra/commands/multitenant/multitenant-remove.js

@@ -0,0 +1,118 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EntraMultitenantRemoveCommand_instances, _EntraMultitenantRemoveCommand_initTelemetry, _EntraMultitenantRemoveCommand_initOptions;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { cli } from '../../../../cli/cli.js';
+class EntraMultitenantRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_REMOVE;
+    }
+    get description() {
+        return 'Removes a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeMultitenantOrg = async () => {
+            try {
+                const tenantId = await this.getCurrentTenantId();
+                let tenantsId = await this.getAllTenantsIds();
+                const tenantsCount = tenantsId.length;
+                if (tenantsCount > 0) {
+                    const tasks = tenantsId
+                        .filter(x => x !== tenantId)
+                        .map(t => this.removeTenant(logger, t));
+                    await Promise.all(tasks);
+                    do {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Waiting 30 seconds...`);
+                        }
+                        await new Promise(resolve => setTimeout(resolve, 30000));
+                        // from current behavior, removing tenant can take a few seconds
+                        // current tenant must be removed once all previous ones were removed
+                        if (this.verbose) {
+                            await logger.logToStderr(`Checking all tenants were removed...`);
+                        }
+                        tenantsId = await this.getAllTenantsIds();
+                        if (this.verbose) {
+                            await logger.logToStderr(`Number of removed tenants: ${tenantsCount - tenantsId.length}`);
+                        }
+                    } while (tenantsId.length !== 1);
+                    // current tenant must be removed as the last one
+                    await this.removeTenant(logger, tenantId);
+                    await logger.logToStderr('Your Multi-Tenant organization is being removed. This can take up to 2 hours.');
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeMultitenantOrg();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to remove multitenant organization?' });
+            if (result) {
+                await removeMultitenantOrg();
+            }
+        }
+    }
+    async getAllTenantsIds() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants?$select=tenantId`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const tenants = await odata.getAllItems(requestOptions);
+        return tenants.map(x => x.tenantId);
+    }
+    async getCurrentTenantId() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/organization?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const organizations = await odata.getAllItems(requestOptions);
+        return organizations[0].id;
+    }
+    async removeTenant(logger, tenantId) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing tenant: ${tenantId}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants/${tenantId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        await request.delete(requestOptions);
+    }
+}
+_EntraMultitenantRemoveCommand_instances = new WeakSet(), _EntraMultitenantRemoveCommand_initTelemetry = function _EntraMultitenantRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _EntraMultitenantRemoveCommand_initOptions = function _EntraMultitenantRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-f, --force'
+    });
+};
+export default new EntraMultitenantRemoveCommand();
+//# sourceMappingURL=multitenant-remove.js.map

package/dist/m365/entra/commands/multitenant/multitenant-set.js

@@ -0,0 +1,72 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _EntraMultitenantSetCommand_instances, _EntraMultitenantSetCommand_initTelemetry, _EntraMultitenantSetCommand_initOptions, _EntraMultitenantSetCommand_initValidators, _EntraMultitenantSetCommand_initTypes;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantSetCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_SET;
+    }
+    get description() {
+        return 'Updates the properties of a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Updating multitenant organization...');
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName
+            }
+        };
+        try {
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraMultitenantSetCommand_instances = new WeakSet(), _EntraMultitenantSetCommand_initTelemetry = function _EntraMultitenantSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _EntraMultitenantSetCommand_initOptions = function _EntraMultitenantSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _EntraMultitenantSetCommand_initValidators = function _EntraMultitenantSetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!args.options.displayName && !args.options.description) {
+            return 'Specify either displayName or description or both.';
+        }
+        return true;
+    });
+}, _EntraMultitenantSetCommand_initTypes = function _EntraMultitenantSetCommand_initTypes() {
+    this.types.string.push('displayName', 'description');
+};
+export default new EntraMultitenantSetCommand();
+//# sourceMappingURL=multitenant-set.js.map

package/dist/m365/entra/commands.js

@@ -72,7 +72,10 @@ export default {
     M365GROUP_USER_LIST: `${prefix} m365group user list`,
     M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
     M365GROUP_USER_SET: `${prefix} m365group user set`,
+    MULTITENANT_ADD: `${prefix} multitenant add`,
     MULTITENANT_GET: `${prefix} multitenant get`,
+    MULTITENANT_REMOVE: `${prefix} multitenant remove`,
+    MULTITENANT_SET: `${prefix} multitenant set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,