@pnp/cli-microsoft365 7.2.0-beta.6775e3a → 7.2.0-beta.8577f52

package/dist/m365/spo/commands/list/list-retentionlabel-ensure.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListRetentionLabelEnsureCommand_instances, _SpoListRetentionLabelEnsureCommand_initTelemetry, _SpoListRetentionLabelEnsureCommand_initOptions, _SpoListRetentionLabelEnsureCommand_initValidators, _SpoListRetentionLabelEnsureCommand_initOptionSets;
 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';
@@ -27,49 +28,38 @@ class SpoListRetentionLabelEnsureCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            let listRestUrl = '';
-            let listServerRelativeUrl = '';
-            if (args.options.listUrl) {
-                const listServerRelativeUrlFromPath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listServerRelativeUrl = listServerRelativeUrlFromPath;
-            }
-            else {
-                if (args.options.listId) {
-                    listRestUrl = `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
-                }
-                else {
-                    listRestUrl = `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const listInstance = await request.get(requestOptions);
-                listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
-            }
+            const listServerRelativeUrl = await this.getListServerRelativeUrl(args, logger);
             const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: args.options.name,
-                    syncToItems: args.options.syncToItems || false
-                },
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            await spo.applyDefaultRetentionLabelToList(args.options.webUrl, args.options.name, listAbsoluteUrl, args.options.syncToItems, logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getListServerRelativeUrl(args, logger) {
+        if (this.verbose) {
+            logger.logToStderr('Getting the list server relative URL');
+        }
+        if (args.options.listUrl) {
+            return urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+        }
+        let requestUrl = `${args.options.webUrl}/_api/web/`;
+        if (args.options.listId) {
+            requestUrl += `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
+        }
+        else {
+            requestUrl += `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+        }
+        const requestOptions = {
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const listInstance = await request.get(requestOptions);
+        return listInstance.RootFolder.ServerRelativeUrl;
+    }
 }
 _SpoListRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListRetentionLabelEnsureCommand_initTelemetry = function _SpoListRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -11,6 +11,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 SpoListRetentionLabelRemoveCommand extends SpoCommand {
     get name() {
         return commands.LIST_RETENTIONLABEL_REMOVE;
@@ -44,21 +45,7 @@ class SpoListRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const listServerRelativeUrl = await this.getListServerRelativeUrl(args, logger);
             const listAbsoluteUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: '',
-                    blockDelete: false,
-                    blockEdit: false,
-                    syncToItems: false
-                },
-                responseType: 'json'
-            };
-            await request.post(requestOptions);
+            await spo.removeDefaultRetentionLabelFromList(args.options.webUrl, listAbsoluteUrl, logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -71,15 +58,15 @@ class SpoListRetentionLabelRemoveCommand extends SpoCommand {
         if (args.options.listUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
         }
-        let listRestUrl = '';
+        let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.listId) {
-            listRestUrl = `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
+            requestUrl += `lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')/`;
         }
         else {
-            listRestUrl = `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+            requestUrl += `lists/getByTitle('${formatting.encodeQueryParameter(args.options.listTitle)}')/`;
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/listitem/listitem-batch-add.js

@@ -111,6 +111,11 @@ class SpoListItemBatchAddCommand extends SpoCommand {
             .filter((line) => line.startsWith('{'))
             .forEach((line, index) => {
             const parsedResponse = JSON.parse(line);
+            if (parsedResponse.error) {
+                // if an error object is returned, the request failed
+                const error = parsedResponse.error;
+                throw error.message.value;
+            }
             parsedResponse.value.forEach((fieldValueResult) => {
                 batchResults.push({
                     csvLineNumber: (index + 2),

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

@@ -4,14 +4,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.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 spoWebRetentionLabelListCommand from '../web/web-retentionlabel-list.js';
+import { spo } from '../../../../utils/spo.js';
+import { odata } from '../../../../utils/odata.js';
 class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
     get name() {
         return commands.LISTITEM_RETENTIONLABEL_ENSURE;
@@ -29,68 +30,66 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const labelInformation = await this.getLabelInformation(args.options, logger);
+            const listAbsoluteUrl = await this.getListAbsoluteUrl(args.options, logger);
+            const labelName = await this.getLabelName(args.options, logger);
             if (args.options.assetId) {
                 await this.applyAssetId(args.options, logger);
             }
-            await this.applyLabel(args.options, labelInformation, logger);
+            await spo.applyRetentionLabelToListItems(args.options.webUrl, labelName, listAbsoluteUrl, [parseInt(args.options.listItemId)], logger, args.options.verbose);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getLabelInformation(options, logger) {
-        const cmdOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: options.debug,
-            verbose: options.verbose
-        };
-        const output = await Cli.executeCommandWithOutput(spoWebRetentionLabelListCommand, { options: { ...cmdOptions, _: [] } });
+    async getLabelName(options, logger) {
+        if (options.name) {
+            return options.name;
+        }
         if (this.verbose) {
-            await logger.logToStderr(output.stderr);
+            logger.logToStderr(`Retrieving the name of the retention label based on the Id '${options.id}'...`);
+        }
+        const requestUrl = `${options.webUrl}/_api/SP.CompliancePolicy.SPPolicyStoreProxy.GetAvailableTagsForSite(siteUrl=@a1)?@a1='${formatting.encodeQueryParameter(options.webUrl)}'`;
+        const labels = await odata.getAllItems(requestUrl);
+        const label = labels.find(l => l.TagId === options.id);
+        if (label === undefined) {
+            throw new Error(`The specified retention label does not exist or is not published to this SharePoint site. Use the name of the label if you want to apply an unpublished label.`);
         }
-        const labels = JSON.parse(output.stdout);
-        const label = labels.find(l => l.TagName === options.name || l.TagId === options.id);
         if (this.verbose && label !== undefined) {
             await logger.logToStderr(`Retention label found in the list of available labels: '${label.TagName}' / '${label.TagId}'...`);
         }
-        if (label === undefined) {
-            throw new Error(`The specified retention label does not exist`);
-        }
-        return {
-            complianceTag: label.TagName,
-            isTagPolicyHold: label.BlockDelete,
-            isTagPolicyRecord: label.BlockEdit,
-            isEventBasedTag: label.IsEventTag,
-            isTagSuperLock: label.SuperLock,
-            isUnlockedAsDefault: label.UnlockedAsDefault
-        };
+        return label.TagName;
     }
-    async applyLabel(options, labelInformation, logger) {
+    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) {
-            await logger.logToStderr(`Applying retention label to item in list '${options.listId || options.listTitle || options.listUrl}' in site at ${options.webUrl}...`);
+            await logger.logToStderr(`Retrieving list absolute URL...`);
         }
         let requestUrl = `${options.webUrl}/_api/web`;
         if (options.listId) {
-            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/SetComplianceTag()`;
+            requestUrl += `/lists(guid'${formatting.encodeQueryParameter(options.listId)}')`;
         }
         else if (options.listTitle) {
-            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/SetComplianceTag()`;
-        }
-        else if (options.listUrl) {
-            const listServerRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-            requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/SetComplianceTag()?@listUrl='${formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            requestUrl += `/lists/getByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
         }
         const requestOptions = {
-            url: requestUrl,
+            url: `${requestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            data: labelInformation,
             responseType: 'json'
         };
-        await request.post(requestOptions);
+        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;
     }
     async applyAssetId(options, logger) {
         if (this.verbose) {

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;
@@ -38,44 +40,46 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
         }
     }
     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/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/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/sitescript/sitescript-get.js

@@ -36,8 +36,12 @@ class SpoSiteScriptGetCommand extends SpoCommand {
                 data: { id: args.options.id },
                 responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            await logger.log(res);
+            const response = await request.post(requestOptions);
+            if (args.options.content === true) {
+                await logger.log(JSON.parse(response.Content));
+                return;
+            }
+            await logger.log(response);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -47,6 +51,8 @@ class SpoSiteScriptGetCommand extends SpoCommand {
 _SpoSiteScriptGetCommand_instances = new WeakSet(), _SpoSiteScriptGetCommand_initOptions = function _SpoSiteScriptGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
+    }, {
+        option: '-c, --content'
     });
 }, _SpoSiteScriptGetCommand_initValidators = function _SpoSiteScriptGetCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -9,6 +9,7 @@ import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { setTimeout } from 'timers/promises';
 class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     get name() {
         return commands.TENANT_RECYCLEBINITEM_RESTORE;
@@ -36,13 +37,29 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
                     siteUrl: args.options.siteUrl
                 }
             };
-            const res = await request.post(requestOptions);
-            await logger.log(JSON.parse(res));
+            const response = await request.post(requestOptions);
+            let responseContent = JSON.parse(response);
+            if (args.options.wait && !responseContent.IsComplete) {
+                responseContent = await this.waitUntilTenantRestoreFinished(responseContent.PollingInterval, requestOptions, logger);
+            }
+            await logger.log(responseContent);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async waitUntilTenantRestoreFinished(pollingInterval, requestOptions, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Site collection still restoring. Retrying in ${pollingInterval / 1000} seconds...`);
+        }
+        await setTimeout(pollingInterval);
+        const response = await request.post(requestOptions);
+        const responseContent = JSON.parse(response);
+        if (responseContent.IsComplete) {
+            return responseContent;
+        }
+        return await this.waitUntilTenantRestoreFinished(responseContent.PollingInterval, requestOptions, logger);
+    }
 }
 _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
     this.telemetry.push((args) => {