@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 6.0.0-beta.0b0fb88

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -65,7 +65,7 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             listId = res.Id;
-            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
+            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.listItemId, args.options.date || '');
             const requestOptions = {
                 url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -116,7 +116,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-d, --date [date]'
     });
@@ -129,9 +129,9 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a number`;
+            return `${args.options.listItemId} is not a number`;
         }
         if (id < 1) {
             return `Item ID must be a positive number`;

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -80,7 +80,7 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
                     'Content-Type': 'text/xml',
                     'X-RequestDigest': formDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.id},1" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.listItemId},1" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -101,7 +101,7 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --listItemId <listItemId>'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -109,9 +109,9 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
     });
 }, _SpoListItemRecordUndeclareCommand_initValidators = function _SpoListItemRecordUndeclareCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const id = parseInt(args.options.id);
+        const id = parseInt(args.options.listItemId);
         if (isNaN(id)) {
-            return `${args.options.id} is not a valid list item ID`;
+            return `${args.options.listItemId} is not a valid list item ID`;
         }
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceBreakCommand_instances, _SpoListItemRoleInheritanceBreakCommand_initTelemetry, _SpoListItemRoleInheritanceBreakCommand_initOptions, _SpoListItemRoleInheritanceBreakCommand_initValidators, _SpoListItemRoleInheritanceBreakCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -35,32 +36,53 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
         return 'Break inheritance of list item';
     }
     commandAction(logger, args, cb) {
+        var _a;
         if (this.verbose) {
             logger.logToStderr(`Breaking role inheritance of list item in site at ${args.options.webUrl}...`);
         }
-        let requestUrl = `${args.options.webUrl}/_api/web/lists`;
-        if (args.options.listId) {
-            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+        const breakListItemRoleInheritance = () => {
+            let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+            if (args.options.listId) {
+                requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else {
+                requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            let keepExistingPermissions = true;
+            if (args.options.clearExistingPermissions) {
+                keepExistingPermissions = !args.options.clearExistingPermissions;
+            }
+            const requestOptions = {
+                url: `${requestUrl}/items(${args.options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .post(requestOptions)
+                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            breakListItemRoleInheritance();
         }
         else {
-            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        }
-        let keepExistingPermissions = true;
-        if (args.options.clearExistingPermissions) {
-            keepExistingPermissions = !args.options.clearExistingPermissions;
+            cli_1.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 ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    breakListItemRoleInheritance();
+                }
+            });
         }
-        const requestOptions = {
-            url: `${requestUrl}/items(${args.options.listItemId})/breakroleinheritance(${keepExistingPermissions})`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
 _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemRoleInheritanceBreakCommand_initTelemetry = function _SpoListItemRoleInheritanceBreakCommand_initTelemetry() {
@@ -68,7 +90,8 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            clearExistingPermissions: args.options.clearExistingPermissions === true
+            clearExistingPermissions: args.options.clearExistingPermissions === true,
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initOptions = function _SpoListItemRoleInheritanceBreakCommand_initOptions() {
@@ -82,6 +105,8 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         option: '-t, --listTitle [listTitle]'
     }, {
         option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initValidators = function _SpoListItemRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceResetCommand_instances, _SpoListItemRoleInheritanceResetCommand_initTelemetry, _SpoListItemRoleInheritanceResetCommand_initOptions, _SpoListItemRoleInheritanceResetCommand_initValidators, _SpoListItemRoleInheritanceResetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -35,32 +36,57 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
         return 'Restores the role inheritance of list item, file, or folder';
     }
     commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/web/lists`;
-        if (args.options.listId) {
-            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+        var _a;
+        if (this.verbose) {
+            logger.logToStderr(`Restore role inheritance of list item in site at ${args.options.webUrl}...`);
+        }
+        const resetListItemRoleInheritance = () => {
+            let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+            if (args.options.listId) {
+                requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else {
+                requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            const requestOptions = {
+                url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .post(requestOptions)
+                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            resetListItemRoleInheritance();
         }
         else {
-            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            cli_1.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 ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    resetListItemRoleInheritance();
+                }
+            });
         }
-        const requestOptions = {
-            url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
 _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemRoleInheritanceResetCommand_initTelemetry = function _SpoListItemRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceResetCommand_initOptions = function _SpoListItemRoleInheritanceResetCommand_initOptions() {
@@ -72,6 +98,8 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListItemRoleInheritanceResetCommand_initValidators = function _SpoListItemRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/page/page-column-get.js

@@ -34,7 +34,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -61,7 +61,7 @@ _SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_ini
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <section>'
     }, {

package/dist/m365/spo/commands/page/page-column-list.js

@@ -34,7 +34,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -54,7 +54,7 @@ _SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <sectionId>'
     });

package/dist/m365/spo/commands/page/page-control-get.js

@@ -34,8 +34,8 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
         return 'Gets information about the specific control on a modern page';
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -64,7 +64,7 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
             }
             else {
                 if (this.verbose) {
-                    logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.name}`);
+                    logger.logToStderr(`Control with ID ${args.options.id} not found on page ${args.options.pageName}`);
                 }
             }
             cb();
@@ -75,7 +75,7 @@ _SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

package/dist/m365/spo/commands/page/page-control-list.js

@@ -37,8 +37,8 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
         return ['id', 'type', 'title'];
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -70,7 +70,7 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
 }
 _SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand_initOptions = function _SpoPageControlListCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     });

package/dist/m365/spo/commands/page/page-control-set.js

@@ -35,8 +35,8 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
         return 'Updates web part data or properties of a control on a modern page';
     }
     commandAction(logger, args, cb) {
-        let pageName = args.options.name;
-        if (args.options.name.indexOf('.aspx') < 0) {
+        let pageName = args.options.pageName;
+        if (args.options.pageName.indexOf('.aspx') < 0) {
             pageName += '.aspx';
         }
         const requestOptions = {
@@ -151,7 +151,7 @@ _SpoPageControlSetCommand_instances = new WeakSet(), _SpoPageControlSetCommand_i
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {

package/dist/m365/spo/commands/page/page-section-add.js

@@ -36,7 +36,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
         return 'Adds section to modern page';
     }
     commandAction(logger, args, cb) {
-        let pageFullName = args.options.name.toLowerCase();
+        let pageFullName = args.options.pageName.toLowerCase();
         if (pageFullName.indexOf('.aspx') < 0) {
             pageFullName += '.aspx';
         }
@@ -174,7 +174,7 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {

package/dist/m365/spo/commands/page/page-section-get.js

@@ -34,7 +34,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections
                 .filter(section => section.order === args.options.section);
@@ -50,7 +50,7 @@ _SpoPageSectionGetCommand_instances = new WeakSet(), _SpoPageSectionGetCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     }, {
         option: '-s, --section <section>'
     });

package/dist/m365/spo/commands/page/page-section-list.js

@@ -34,7 +34,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         Page_1.Page
-            .getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose)
+            .getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose)
             .then((clientSidePage) => {
             const sections = clientSidePage.sections;
             const isJSONOutput = args.options.output === 'json';
@@ -60,7 +60,7 @@ _SpoPageSectionListCommand_instances = new WeakSet(), _SpoPageSectionListCommand
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --name <name>'
+        option: '-n, --pageName <pageName>'
     });
 }, _SpoPageSectionListCommand_initValidators = function _SpoPageSectionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -44,7 +44,7 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.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">${utils_1.formatting.escapeXml(args.options.grantId)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.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">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -61,7 +61,7 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
 }
 _SpoServicePrincipalGrantRevokeCommand_instances = new WeakSet(), _SpoServicePrincipalGrantRevokeCommand_initOptions = function _SpoServicePrincipalGrantRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --grantId <grantId>'
+        option: '-i, --id <id>'
     });
 };
 module.exports = new SpoServicePrincipalGrantRevokeCommand();

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-approve.js

@@ -54,7 +54,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="15" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="17" ParentId="15" Name="PermissionRequests" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -76,12 +76,12 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
 }
 _SpoServicePrincipalPermissionRequestApproveCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestApproveCommand_initOptions = function _SpoServicePrincipalPermissionRequestApproveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --requestId <requestId>'
+        option: '-i, --id <id>'
     });
 }, _SpoServicePrincipalPermissionRequestApproveCommand_initValidators = function _SpoServicePrincipalPermissionRequestApproveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
-            return `${args.options.requestId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-deny.js

@@ -54,7 +54,7 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.requestId)}}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="160" ObjectPathId="159" /><ObjectPath Id="162" ObjectPathId="161" /><ObjectPath Id="164" ObjectPathId="163" /><Method Name="Deny" Id="165" ObjectPathId="163" /></Actions><ObjectPaths><Constructor Id="159" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="161" ParentId="159" Name="PermissionRequests" /><Method Id="163" ParentId="161" Name="GetById"><Parameters><Parameter Type="Guid">{${utils_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -71,12 +71,12 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
 }
 _SpoServicePrincipalPermissionRequestDenyCommand_instances = new WeakSet(), _SpoServicePrincipalPermissionRequestDenyCommand_initOptions = function _SpoServicePrincipalPermissionRequestDenyCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --requestId <requestId>'
+        option: '-i, --id <id>'
     });
 }, _SpoServicePrincipalPermissionRequestDenyCommand_initValidators = function _SpoServicePrincipalPermissionRequestDenyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.requestId)) {
-            return `${args.options.requestId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

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

@@ -35,7 +35,7 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
         return 'Creates a site collection app catalog in the specified site';
     }
     commandAction(logger, args, cb) {
-        const url = args.options.url;
+        const url = args.options.siteUrl;
         let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
@@ -74,10 +74,10 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
 }
 _SpoSiteAppCatalogAddCommand_instances = new WeakSet(), _SpoSiteAppCatalogAddCommand_initOptions = function _SpoSiteAppCatalogAddCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoSiteAppCatalogAddCommand_initValidators = function _SpoSiteAppCatalogAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteAppCatalogAddCommand();
 //# sourceMappingURL=site-appcatalog-add.js.map

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

@@ -35,7 +35,7 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
         return 'Removes site collection app catalog from the specified site';
     }
     commandAction(logger, args, cb) {
-        const url = args.options.url;
+        const url = args.options.siteUrl;
         let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
@@ -74,10 +74,10 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
 }
 _SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

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

@@ -47,7 +47,7 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
     }
     getApplicationPermission(args, siteId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${siteId}/permissions/${args.options.permissionId}`,
+            url: `${this.resource}/v1.0/sites/${siteId}/permissions/${args.options.id}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -78,7 +78,7 @@ _SpoSiteAppPermissionGetCommand_instances = new WeakSet(), _SpoSiteAppPermission
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId <permissionId>'
+        option: '-i, --id <id>'
     });
 }, _SpoSiteAppPermissionGetCommand_initValidators = function _SpoSiteAppPermissionGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));

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

@@ -71,8 +71,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         });
     }
     getPermissionIds(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve([args.options.permissionId]);
+        if (args.options.id) {
+            return Promise.resolve([args.options.id]);
         }
         return this
             .getPermissions()
@@ -139,7 +139,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
-            permissionId: typeof args.options.permissionId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             confirm: (!!args.options.confirm).toString()
         });
     });
@@ -147,7 +147,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId [permissionId]'
+        option: '-i, --id [id]'
     }, {
         option: '--appId [appId]'
     }, {
@@ -163,7 +163,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionRemoveCommand_initOptionSets = function _SpoSiteAppPermissionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appDisplayName', 'permissionId']);
+    this.optionSets.push(['appId', 'appDisplayName', 'id']);
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map