@pnp/cli-microsoft365 7.2.0-beta.54705a9 → 7.2.0-beta.8577f52

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
+import * as url from 'url';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,6 +12,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
 class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.LISTITEM_RETENTIONLABEL_REMOVE;
@@ -31,56 +33,53 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
             await this.removeListItemRetentionLabel(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' located in site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' located in site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeListItemRetentionLabel(logger, args);
             }
         }
     }
     async removeListItemRetentionLabel(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing retention label from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' in site at ${args.options.webUrl}...`);
-        }
         try {
-            let url = `${args.options.webUrl}/_api/web`;
-            if (args.options.listId) {
-                url += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/items(${args.options.listItemId})/SetComplianceTag()`;
-            }
-            else if (args.options.listTitle) {
-                url += `/lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/items(${args.options.listItemId})/SetComplianceTag()`;
-            }
-            else {
-                const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                url += `/GetList(@a1)/items(@a2)/SetComplianceTag()?@a1='${formatting.encodeQueryParameter(listServerRelativeUrl)}'&@a2='${args.options.listItemId}'`;
-            }
-            const requestBody = {
-                "complianceTag": "",
-                "isTagPolicyHold": false,
-                "isTagPolicyRecord": false,
-                "isEventBasedTag": false,
-                "isTagSuperLock": false,
-                "isUnlockedAsDefault": false
-            };
-            const requestOptions = {
-                url: url,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            const listAbsoluteUrl = await this.getListAbsoluteUrl(args.options, logger);
+            await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(args.options.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getListAbsoluteUrl(options, logger) {
+        const parsedUrl = url.parse(options.webUrl);
+        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+        if (options.listUrl) {
+            const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+            return urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving list absolute URL...`);
+        }
+        let requestUrl = `${options.webUrl}/_api/web`;
+        if (options.listId) {
+            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')`;
+        }
+        else if (options.listTitle) {
+            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
+        }
+        const requestOptions = {
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, response.RootFolder.ServerRelativeUrl);
+        const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
+        if (this.verbose) {
+            logger.logToStderr(`List absolute URL found: '${listAbsoluteUrl}'`);
+        }
+        return listAbsoluteUrl;
+    }
 }
 _SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemRetentionLabelRemoveCommand_initTelemetry = function _SpoListItemRetentionLabelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -33,13 +33,8 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand {
             await this.removeRoleAssignment(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeRoleAssignment(logger, args.options);
             }
         }

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-break.js

@@ -34,13 +34,8 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand {
             await this.breakListItemRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to break the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await this.breakListItemRoleInheritance(args.options);
             }
         }

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -34,13 +34,8 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand {
             await this.resetListItemRoleInheritance(args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to reset the role inheritance of ${args.options.listItemId} in list ${args.options.listId ?? args.options.listTitle}?` });
+            if (result) {
                 await this.resetListItemRoleInheritance(args.options);
             }
         }

package/dist/m365/spo/commands/navigation/navigation-node-remove.js

@@ -29,13 +29,8 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand {
             await this.removeNode(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the node ${args.options.id} from the navigation?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the node ${args.options.id} from the navigation?` });
+            if (result) {
                 await this.removeNode(logger, args.options);
             }
         }

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

@@ -27,13 +27,8 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand {
             await this.removeLibrary(logger, args.options.libraryUrl);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the library ${args.options.libraryUrl} as a central location for organization assets?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the library ${args.options.libraryUrl} as a central location for organization assets?` });
+            if (result) {
                 await this.removeLibrary(logger, args.options.libraryUrl);
             }
         }

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

@@ -31,13 +31,8 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand {
             await this.removeOrgNewsSite(logger, args.options.url);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.url} from the list of organizational news sites?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.url} from the list of organizational news sites?` });
+            if (result) {
                 await this.removeOrgNewsSite(logger, args.options.url);
             }
         }

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

@@ -29,13 +29,8 @@ class SpoPageRemoveCommand extends SpoCommand {
             await this.removePage(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the page '${args.options.name}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            if (result) {
                 await this.removePage(logger, args);
             }
         }

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

@@ -31,13 +31,8 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
             await this.removeProperty(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the ${args.options.key} property?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the ${args.options.key} property?` });
+            if (result) {
                 await this.removeProperty(args);
             }
         }

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

@@ -28,13 +28,8 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand {
             await this.removeRoleDefinition(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?` });
+            if (result) {
                 await this.removeRoleDefinition(logger, args);
             }
         }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-revoke.js

@@ -32,18 +32,53 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand {
                 await logger.logToStderr(`Retrieving request digest...`);
             }
             const reqDigest = await spo.getRequestDigest(spoAdminUrl);
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': reqDigest.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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-            };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
+            if (args.options.scope) {
+                // revoke a single scope
+                // #1 get the grant
+                const getGrantRequestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="3" ParentId="1" Name="PermissionGrants" /><Method Id="5" ParentId="3" Name="GetByObjectId"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const grantRequestRes = await request.post(getGrantRequestOptions);
+                const grantRequestJson = JSON.parse(grantRequestRes);
+                const responseInfo = grantRequestJson[0];
+                if (responseInfo.ErrorInfo) {
+                    throw responseInfo.ErrorInfo.ErrorMessage;
+                }
+                const grantInfo = grantRequestJson.pop();
+                // #2 remove the scope from the grant
+                const removeScopeRequestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.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="9" ObjectPathId="8" /><Method Name="Remove" Id="10" ObjectPathId="8"><Parameters><Parameter Type="String">${grantInfo.ClientId}</Parameter><Parameter Type="String">Microsoft Graph</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.scope)}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="8" ParentId="1" Name="GrantManager" /><Constructor Id="1" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
+                };
+                const removeScopeRes = await request.post(removeScopeRequestOptions);
+                const removeScopeResJson = JSON.parse(removeScopeRes);
+                const removeScopeResponse = removeScopeResJson[0];
+                if (removeScopeResponse.ErrorInfo) {
+                    throw removeScopeResponse.ErrorInfo.ErrorMessage;
+                }
+            }
+            else {
+                // revoke the whole grant
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.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="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Method Name="DeleteObject" Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="9" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="11" ParentId="9" Name="PermissionGrants" /><Method Id="13" ParentId="11" Name="GetByObjectId"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
         }
         catch (err) {
@@ -54,6 +89,8 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand {
 _SpoServicePrincipalGrantRevokeCommand_instances = new WeakSet(), _SpoServicePrincipalGrantRevokeCommand_initOptions = function _SpoServicePrincipalGrantRevokeCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
+    }, {
+        option: '-s, --scope [scope]'
     });
 };
 export default new SpoServicePrincipalGrantRevokeCommand();

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-set.js

@@ -32,13 +32,8 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
             await this.toggleServicePrincipal(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?` });
+            if (result) {
                 await this.toggleServicePrincipal(logger, args);
             }
         }

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

@@ -33,12 +33,13 @@ class SpoSiteAddCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         const isClassicSite = args.options.type === 'ClassicSite';
-        if (isClassicSite) {
-            await this.createClassicSite(logger, args);
-        }
-        else {
-            await this.createModernSite(logger, args);
+        const siteUrl = isClassicSite
+            ? await this.createClassicSite(logger, args)
+            : await this.createModernSite(logger, args);
+        if (siteUrl && args.options.withAppCatalog) {
+            await this.addAppCatalog(siteUrl, logger);
         }
+        await logger.log(siteUrl);
     }
     async createModernSite(logger, args) {
         const isTeamSite = args.options.type !== 'CommunicationSite';
@@ -132,19 +133,18 @@ class SpoSiteAddCommand extends SpoCommand {
                 if (response.ErrorMessage !== null) {
                     throw response.ErrorMessage;
                 }
-                await logger.log(response.SiteUrl);
+                return response.SiteUrl;
             }
             else {
-                if (response.SiteStatus === 2) {
-                    await logger.log(response.SiteUrl);
-                }
-                else {
+                if (response.SiteStatus !== 2) {
                     throw 'An error has occurred while creating the site';
                 }
+                return response.SiteUrl;
             }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
+            return;
         }
     }
     async createClassicSite(logger, args) {
@@ -195,8 +195,8 @@ class SpoSiteAddCommand extends SpoCommand {
             }
             const operation = json[json.length - 1];
             const isComplete = operation.IsComplete;
-            if (!args.options.wait || isComplete) {
-                return;
+            if ((!args.options.wait && !args.options.withAppCatalog) || isComplete) {
+                return args.options.url;
             }
             await new Promise((resolve, reject) => {
                 setTimeout(() => {
@@ -212,9 +212,11 @@ class SpoSiteAddCommand extends SpoCommand {
                     });
                 }, operation.PollingInterval);
             });
+            return args.options.url;
         }
         catch (err) {
             this.handleRejectedPromise(err);
+            return;
         }
     }
     async siteExists(url, logger) {
@@ -304,6 +306,34 @@ class SpoSiteAddCommand extends SpoCommand {
             }, operation.PollingInterval);
         });
     }
+    async addAppCatalog(url, logger) {
+        try {
+            this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Adding site collection app catalog...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const response = await request.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContents = json[0];
+            if (responseContents.ErrorInfo) {
+                throw responseContents.ErrorInfo.ErrorMessage;
+            }
+            if (this.verbose) {
+                await logger.logToStderr('Site collection app catalog created');
+            }
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
 }
 _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry = function _SpoSiteAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -316,6 +346,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         telemetryProps.isPublic = args.options.isPublic || false;
         telemetryProps.lcid = args.options.lcid;
         telemetryProps.owners = typeof args.options.owners !== 'undefined';
+        telemetryProps.withAppCatalog = args.options.withAppCatalog || false;
         if (isCommunicationSite) {
             telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
             telemetryProps.siteDesign = args.options.siteDesign;
@@ -373,6 +404,8 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
     }, {
         option: '--removeDeletedSite'
+    }, {
+        option: '--withAppCatalog'
     }, {
         option: '--wait'
     });

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

@@ -72,13 +72,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
             await this.removeSiteAppPermission(logger, args.options);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
+            if (result) {
                 await this.removeSiteAppPermission(logger, args.options);
             }
         }

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -29,13 +29,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
             await this.disconnectHubSite(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?` });
+            if (result) {
                 await this.disconnectHubSite(logger, args);
             }
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -28,13 +28,8 @@ class SpoSiteRecycleBinItemClearCommand extends SpoCommand {
             await this.clearRecycleBin(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear the recycle bin of site ${args.options.siteUrl}?` });
+            if (result) {
                 await this.clearRecycleBin(args, logger);
             }
         }

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -29,13 +29,8 @@ class SpoSiteRecycleBinItemMoveCommand extends SpoCommand {
             await this.moveRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: 'Are you sure you want to move these items to the second-stage recycle bin?'
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to move these items to the second-stage recycle bin?' });
+            if (result) {
                 await this.moveRecycleBinItem(args, logger);
             }
         }

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

@@ -28,13 +28,8 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand {
             await this.removeRecycleBinItem(args, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?` });
+            if (result) {
                 await this.removeRecycleBinItem(args, logger);
             }
         }

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

@@ -33,13 +33,8 @@ class SpoSiteRemoveCommand extends SpoCommand {
             await this.removeSite(logger, args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site ${args.options.url}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the site ${args.options.url}?` });
+            if (result) {
                 await this.removeSite(logger, args);
             }
         }