@pnp/cli-microsoft365 9.0.0-beta.62575a1 → 9.0.0-beta.872d524

package/dist/m365/spo/commands/list/list-roleassignment-add.js

@@ -3,8 +3,9 @@ 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 _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
+var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets, _SpoListRoleAssignmentAddCommand_initTypes;
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -25,6 +26,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -42,39 +44,48 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
                 const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            args.options.roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            let principalId = args.options.principalId;
             if (args.options.upn) {
-                const user = await spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
-                args.options.principalId = user.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                const user = await spo.ensureUser(args.options.webUrl, args.options.upn);
+                principalId = user.Id;
             }
             else if (args.options.groupName) {
                 const group = await spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
-                args.options.principalId = group.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                principalId = group.Id;
             }
-            else {
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+            else if (args.options.entraGroupId || args.options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                let group;
+                if (args.options.entraGroupId) {
+                    group = await entraGroup.getGroupById(args.options.entraGroupId);
+                }
+                else {
+                    group = await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                }
+                const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                principalId = siteUser.Id;
             }
+            await this.addRoleAssignment(requestUrl, principalId, roleDefinitionId);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async addRoleAssignment(requestUrl, logger, options) {
+    async addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
         const requestOptions = {
-            url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
-            method: 'POST',
+            url: `${requestUrl}roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         return request.post(requestOptions);
     }
     async getRoleDefinitionId(options, logger) {
-        if (!options.roleDefinitionName) {
+        if (options.roleDefinitionId) {
             return options.roleDefinitionId;
         }
         const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
@@ -90,6 +101,8 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
             roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
         });
@@ -109,6 +122,10 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -121,18 +138,26 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             return isValidSharePointUrl;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
+            return `'${args.options.listId}' is not a valid GUID for option listId.`;
+        }
+        if (args.options.upn && !validation.isValidUserPrincipalName(args.options.upn)) {
+            return `'${args.options.upn}' is not a valid user principal name for option upn.`;
+        }
+        if (args.options.principalId && !validation.isValidPositiveInteger(args.options.principalId)) {
+            return `Specified principalId '${args.options.principalId}' is not a valid number.`;
         }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
         }
-        if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
-            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
+        if (args.options.roleDefinitionId && !validation.isValidPositiveInteger(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId '${args.options.roleDefinitionId}' is not a valid number.`;
         }
         return true;
     });
 }, _SpoListRoleAssignmentAddCommand_initOptionSets = function _SpoListRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+}, _SpoListRoleAssignmentAddCommand_initTypes = function _SpoListRoleAssignmentAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'upn', 'groupName', 'entraGroupId', 'entraGroupName', 'roleDefinitionName');
 };
 export default new SpoListRoleAssignmentAddCommand();
 //# sourceMappingURL=list-roleassignment-add.js.map

package/dist/m365/spo/commands/list/list-roleassignment-remove.js

@@ -3,16 +3,16 @@ 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 _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators, _SpoListRoleAssignmentRemoveCommand_initOptionSets;
+var _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators, _SpoListRoleAssignmentRemoveCommand_initOptionSets, _SpoListRoleAssignmentRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoUserGetCommand from '../user/user-get.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.LIST_ROLEASSIGNMENT_REMOVE;
@@ -27,11 +27,12 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeRoleAssignment = async () => {
             if (this.verbose) {
-                await logger.logToStderr(`Removing role assignment from list in site at ${args.options.webUrl}...`);
+                await logger.logToStderr(`Removing role assignment from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' of site ${args.options.webUrl}...`);
             }
             try {
                 let requestUrl = `${args.options.webUrl}/_api/web/`;
@@ -45,17 +46,30 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
                     const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
+                let principalId = args.options.principalId;
                 if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                    const user = await spo.ensureUser(args.options.webUrl, args.options.upn);
+                    principalId = user.Id;
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                    const spGroup = await spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    principalId = spGroup.Id;
                 }
-                else {
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                else if (args.options.entraGroupId || args.options.entraGroupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr('Retrieving group information...');
+                    }
+                    let group;
+                    if (args.options.entraGroupId) {
+                        group = await entraGroup.getGroupById(args.options.entraGroupId);
+                    }
+                    else {
+                        group = await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                    }
+                    const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                    principalId = siteUser.Id;
                 }
+                await this.removeRoleAssignment(requestUrl, principalId);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -65,49 +79,22 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
             await removeRoleAssignment();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from the specified user of list '${args.options.listId || args.options.listTitle || args.options.listUrl}'?` });
             if (result) {
                 await removeRoleAssignment();
             }
         }
     }
-    async removeRoleAssignment(requestUrl, logger, options) {
+    async removeRoleAssignment(requestUrl, principalId) {
         const requestOptions = {
-            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
-            method: 'POST',
+            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${principalId}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         return request.post(requestOptions);
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
-    }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
-    }
 }
 _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssignmentRemoveCommand_initTelemetry = function _SpoListRoleAssignmentRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -118,7 +105,9 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            force: (!(!args.options.force)).toString()
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
+            force: !!args.options.force
         });
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptions = function _SpoListRoleAssignmentRemoveCommand_initOptions() {
@@ -136,6 +125,10 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -146,15 +139,24 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             return isValidSharePointUrl;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
+            return `'${args.options.listId}' is not a valid GUID for option listId.`;
+        }
+        if (args.options.upn && !validation.isValidUserPrincipalName(args.options.upn)) {
+            return `'${args.options.upn}' is not a valid user principal name for option upn.`;
+        }
+        if (args.options.principalId && !validation.isValidPositiveInteger(args.options.principalId)) {
+            return `'${args.options.principalId}' is not a valid number for option principalId.`;
         }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
         }
         return true;
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptionSets = function _SpoListRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] });
+}, _SpoListRoleAssignmentRemoveCommand_initTypes = function _SpoListRoleAssignmentRemoveCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'upn', 'groupName', 'entraGroupId', 'entraGroupName');
+    this.types.boolean.push('force');
 };
 export default new SpoListRoleAssignmentRemoveCommand();
 //# sourceMappingURL=list-roleassignment-remove.js.map

package/dist/m365/spo/commands/site/site-appcatalog-remove.js

@@ -3,7 +3,8 @@ 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 _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
+var _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initTelemetry, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators, _SpoSiteAppCatalogRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -21,47 +22,70 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoSiteAppCatalogRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const url = args.options.siteUrl;
-        try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+        const removeSiteAppcatalog = async () => {
+            const url = args.options.siteUrl;
             if (this.verbose) {
                 await logger.logToStderr(`Disabling site collection app catalog...`);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
-            };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('Site collection app catalog disabled');
+            try {
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    if (this.verbose) {
+                        await logger.logToStderr('Site collection app catalog disabled');
+                    }
                 }
             }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeSiteAppcatalog();
         }
-        catch (err) {
-            this.handleRejectedPromise(err);
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app catalog from ${args.options.siteUrl}?` });
+            if (result) {
+                await removeSiteAppcatalog();
+            }
         }
     }
 }
-_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
+_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initTelemetry = function _SpoSiteAppCatalogRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-f, --force'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
+}, _SpoSiteAppCatalogRemoveCommand_initTypes = function _SpoSiteAppCatalogRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl');
 };
 export default new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

package/dist/m365/spo/commands/site/site-remove.js

@@ -31,9 +31,6 @@ class SpoSiteRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         if (args.options.force) {
             await this.removeSite(logger, args.options);
         }
@@ -196,7 +193,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             skipRecycleBin: !!args.options.skipRecycleBin,
             fromRecycleBin: !!args.options.fromRecycleBin,
-            wait: !!args.options.wait,
             force: !!args.options.force
         });
     });
@@ -207,8 +203,6 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         option: '--skipRecycleBin'
     }, {
         option: '--fromRecycleBin'
-    }, {
-        option: '--wait'
     }, {
         option: '-f, --force'
     });
@@ -230,7 +224,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     });
 }, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
     this.types.string.push('url');
-    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'wait', 'force');
+    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.js

@@ -3,7 +3,7 @@ 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 _SpoTenantApplicationCustomizerGetCommand_instances, _SpoTenantApplicationCustomizerGetCommand_initTelemetry, _SpoTenantApplicationCustomizerGetCommand_initOptions, _SpoTenantApplicationCustomizerGetCommand_initValidators, _SpoTenantApplicationCustomizerGetCommand_initOptionSets;
+var _SpoTenantApplicationCustomizerGetCommand_instances, _SpoTenantApplicationCustomizerGetCommand_initTelemetry, _SpoTenantApplicationCustomizerGetCommand_initOptions, _SpoTenantApplicationCustomizerGetCommand_initValidators, _SpoTenantApplicationCustomizerGetCommand_initOptionSets, _SpoTenantApplicationCustomizerGetCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
@@ -26,6 +26,7 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -50,13 +51,20 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                     throw 'The specified application customizer was not found';
                 }
                 listItemInstances.forEach(v => delete v['ID']);
+                let listItemInstance;
                 if (listItemInstances.length > 1) {
                     const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
-                    const result = await cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
-                    await logger.log(result);
+                    listItemInstance = await cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
                 }
                 else {
-                    await logger.log(listItemInstances[0]);
+                    listItemInstance = listItemInstances[0];
+                }
+                if (!args.options.tenantWideExtensionComponentProperties) {
+                    await logger.log(listItemInstance);
+                }
+                else {
+                    const properties = formatting.tryParseJson(listItemInstance.TenantWideExtensionComponentProperties);
+                    await logger.log(properties);
                 }
             }
             else {
@@ -73,7 +81,8 @@ _SpoTenantApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoTenantA
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined'
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            tenantWideExtensionComponentProperties: !!args.options.tenantWideExtensionComponentProperties
         });
     });
 }, _SpoTenantApplicationCustomizerGetCommand_initOptions = function _SpoTenantApplicationCustomizerGetCommand_initOptions() {
@@ -83,6 +92,8 @@ _SpoTenantApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoTenantA
         option: '-i, --id [id]'
     }, {
         option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '-p, --tenantWideExtensionComponentProperties'
     });
 }, _SpoTenantApplicationCustomizerGetCommand_initValidators = function _SpoTenantApplicationCustomizerGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -96,6 +107,9 @@ _SpoTenantApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoTenantA
     });
 }, _SpoTenantApplicationCustomizerGetCommand_initOptionSets = function _SpoTenantApplicationCustomizerGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+}, _SpoTenantApplicationCustomizerGetCommand_initTypes = function _SpoTenantApplicationCustomizerGetCommand_initTypes() {
+    this.types.string.push('title', 'id', 'clientSideComponentId');
+    this.types.boolean.push('tenantWideExtensionComponentProperties');
 };
 export default new SpoTenantApplicationCustomizerGetCommand();
 //# sourceMappingURL=tenant-applicationcustomizer-get.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -3,7 +3,7 @@ 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 _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
+var _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets, _SpoTenantCommandSetGetCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
@@ -27,6 +27,7 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
@@ -47,7 +48,7 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         const reqOptions = {
             url: `${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=${filter}`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -55,13 +56,20 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
             const listItemInstances = await request.get(reqOptions);
             if (listItemInstances?.value.length > 0) {
                 listItemInstances.value.forEach(v => delete v['ID']);
+                let listItemInstance;
                 if (listItemInstances.value.length > 1) {
                     const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances.value);
-                    const result = await cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
-                    await logger.log(result);
+                    listItemInstance = await cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
                 }
                 else {
-                    await logger.log(listItemInstances.value[0]);
+                    listItemInstance = listItemInstances.value[0];
+                }
+                if (!args.options.tenantWideExtensionComponentProperties) {
+                    await logger.log(listItemInstance);
+                }
+                else {
+                    const properties = formatting.tryParseJson(listItemInstance.TenantWideExtensionComponentProperties);
+                    await logger.log(properties);
                 }
             }
             else {
@@ -78,7 +86,8 @@ _SpoTenantCommandSetGetCommand_instances = new WeakSet(), _SpoTenantCommandSetGe
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined'
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            tenantWideExtensionComponentProperties: !!args.options.tenantWideExtensionComponentProperties
         });
     });
 }, _SpoTenantCommandSetGetCommand_initOptions = function _SpoTenantCommandSetGetCommand_initOptions() {
@@ -88,6 +97,8 @@ _SpoTenantCommandSetGetCommand_instances = new WeakSet(), _SpoTenantCommandSetGe
         option: '-i, --id [id]'
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '-p, --tenantWideExtensionComponentProperties'
     });
 }, _SpoTenantCommandSetGetCommand_initValidators = function _SpoTenantCommandSetGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -101,6 +112,9 @@ _SpoTenantCommandSetGetCommand_instances = new WeakSet(), _SpoTenantCommandSetGe
     });
 }, _SpoTenantCommandSetGetCommand_initOptionSets = function _SpoTenantCommandSetGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+}, _SpoTenantCommandSetGetCommand_initTypes = function _SpoTenantCommandSetGetCommand_initTypes() {
+    this.types.string.push('title', 'id', 'clientSideComponentId');
+    this.types.boolean.push('tenantWideExtensionComponentProperties');
 };
 export default new SpoTenantCommandSetGetCommand();
 //# sourceMappingURL=tenant-commandset-get.js.map