@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

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-add.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators;
+var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators, _SpoSiteAppPermissionAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_ADD;
@@ -137,9 +138,6 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
     });
 }, _SpoSiteAppPermissionAddCommand_initValidators = function _SpoSiteAppPermissionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.appDisplayName) {
-            return `Specify appId or appDisplayName, one is required`;
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
@@ -148,6 +146,8 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
+}, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName']);
 };
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators;
+var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators, _SpoSiteAppPermissionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_REMOVE;
@@ -70,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()
@@ -138,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()
         });
     });
@@ -146,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]'
     }, {
@@ -156,19 +157,13 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     });
 }, _SpoSiteAppPermissionRemoveCommand_initValidators = function _SpoSiteAppPermissionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.appDisplayName && !args.options.permissionId) {
-            return `Specify appId, appDisplayName, or permissionId. One is required`;
-        }
-        if ((args.options.appId && args.options.appDisplayName) ||
-            (args.options.appId && args.options.permissionId) ||
-            (args.options.permissionId && args.options.appDisplayName)) {
-            return 'Use either appId, appDisplayName, or permissionId, but not multiple';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
+}, _SpoSiteAppPermissionRemoveCommand_initOptionSets = function _SpoSiteAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName', 'id']);
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators;
+var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_SET;
@@ -57,8 +58,8 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
     getPermission(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve(args.options.permissionId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const permissionRequestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -110,7 +111,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
 _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermissionSetCommand_initTelemetry = function _SpoSiteAppPermissionSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            permissionId: typeof args.options.permissionId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined'
         });
@@ -119,7 +120,7 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId [permissionId]'
+        option: '-i, --id [id]'
     }, {
         option: '--appId [appId]'
     }, {
@@ -129,9 +130,6 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
     });
 }, _SpoSiteAppPermissionSetCommand_initValidators = function _SpoSiteAppPermissionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.permissionId && !args.options.appId && !args.options.appDisplayName) {
-            return `Specify permissionId, appId or appDisplayName, one is required`;
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
@@ -140,6 +138,8 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
+}, _SpoSiteAppPermissionSetCommand_initOptionSets = function _SpoSiteAppPermissionSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'appId', 'appDisplayName']);
 };
 module.exports = new SpoSiteAppPermissionSetCommand();
 //# sourceMappingURL=site-apppermission-set.js.map

package/dist/m365/spo/commands/site/site-chrome-set.js

@@ -93,7 +93,7 @@ class SpoSiteChromeSetCommand extends SpoCommand_1.default {
             body["footerEnabled"] = !disableFooter;
         }
         const requestOptions = {
-            url: `${args.options.url}/_api/web/SetChromeOptions`,
+            url: `${args.options.siteUrl}/_api/web/SetChromeOptions`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -120,7 +120,7 @@ _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_ini
     });
 }, _SpoSiteChromeSetCommand_initOptions = function _SpoSiteChromeSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--headerLayout [headerLayout]',
         autocomplete: ['Standard', 'Compact', 'Minimal', 'Extended']
@@ -145,7 +145,7 @@ _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_ini
     });
 }, _SpoSiteChromeSetCommand_initValidators = function _SpoSiteChromeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -105,7 +105,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             logger.logToStderr(`Checking if site ${args.options.url} exists...`);
         }
         const options = {
-            webUrl: args.options.url,
+            url: args.options.url,
             output: 'json',
             debug: this.debug,
             verbose: this.verbose

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

@@ -51,7 +51,7 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
             optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
         }
         const requestOptions = {
-            url: `${args.options.siteUrl}/_api/GroupSiteManager/CreateGroupForSite`,
+            url: `${args.options.url}/_api/GroupSiteManager/CreateGroupForSite`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 accept: 'application/json;odata=nometadata',
@@ -79,7 +79,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
     });
 }, _SpoSiteGroupifyCommand_initOptions = function _SpoSiteGroupifyCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-a, --alias <alias>'
     }, {
@@ -94,7 +94,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
         option: '--keepOldHomepage'
     });
 }, _SpoSiteGroupifyCommand_initValidators = function _SpoSiteGroupifyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map

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

@@ -97,11 +97,6 @@ class SpoSiteListCommand extends SpoCommand_1.default {
             }, err => reject(err));
         });
     }
-    /*
-      The type property currently defaults to Teamsite.
-      It makes more sense to default to All. Certainly after adding the 'includeOneDriveSites' option.
-      Changing this will be a breaking change. We'll remove the default the next major version.
-    */
     getWebTemplateId(options) {
         if (options.webTemplate) {
             return options.webTemplate;
@@ -109,11 +104,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         if (options.includeOneDriveSites) {
             return '';
         }
-        let siteType = options.type;
-        if (!siteType) {
-            siteType = 'TeamSite';
-        }
-        switch (siteType) {
+        switch (options.type) {
             case "TeamSite":
                 return 'GROUP#0';
             case "CommunicationSite":
@@ -127,7 +118,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             webTemplate: args.options.webTemplate,
-            siteType: args.options.type || 'TeamSite',
+            type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
             deleted: args.options.deleted,
             includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined'
@@ -136,9 +127,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
 }, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        // To not introduce a breaking change, 'All' has been added.
-        // You should use all when using '--includeOneDriveSites'
-        autocomplete: ['TeamSite', 'CommunicationSite', 'All']
+        autocomplete: ['TeamSite', 'CommunicationSite']
     }, {
         option: '--webTemplate [webTemplate]'
     }, {
@@ -153,14 +142,14 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
         if (args.options.type && args.options.webTemplate) {
             return 'Specify either type or webTemplate, but not both';
         }
-        const typeValues = ['TeamSite', 'CommunicationSite', 'All'];
+        const typeValues = ['TeamSite', 'CommunicationSite'];
         if (args.options.type &&
             typeValues.indexOf(args.options.type) < 0) {
             return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
         }
         if (args.options.includeOneDriveSites
-            && (!args.options.type || args.options.type !== 'All')) {
-            return 'When using includeOneDriveSites, specify All as value for type';
+            && (args.options.type || args.options.webTemplate)) {
+            return 'When using includeOneDriveSites, don\'t specify the type or webTemplate options';
         }
         return true;
     }));

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

@@ -55,9 +55,9 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
                 optionsBitmask = optionsBitmask | 16;
             }
             const requestOptions = {
-                "SourceSiteUrl": options.siteUrl,
-                "TargetSiteUrl": options.newSiteUrl,
-                "TargetSiteTitle": options.newSiteTitle || null,
+                "SourceSiteUrl": options.url,
+                "TargetSiteUrl": options.newUrl,
+                "TargetSiteTitle": options.newTitle || null,
                 "Option": optionsBitmask,
                 "Reserve": null,
                 "SkipGestures": null,
@@ -87,7 +87,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
                 return Promise.resolve();
             }
             return new Promise((resolve, reject) => {
-                this.waitForRenameCompletion(this, true, spoAdminUrl, options.siteUrl, resolve, reject, 0);
+                this.waitForRenameCompletion(this, true, spoAdminUrl, options.url, resolve, reject, 0);
             });
         }).then(() => {
             logger.log(this.operationData);
@@ -127,7 +127,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
 _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newSiteTitle: args.options.newSiteTitle ? true : false,
+            newTitle: args.options.newTitle ? true : false,
             suppressMarketplaceAppCheck: args.options.suppressMarketplaceAppCheck,
             suppressWorkflow2013Check: args.options.suppressWorkflow2013Check,
             wait: args.options.wait
@@ -135,11 +135,11 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
     });
 }, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --siteUrl <siteUrl>'
+        option: '-u, --url <url>'
     }, {
-        option: '--newSiteUrl <newSiteUrl>'
+        option: '--newUrl <newUrl>'
     }, {
-        option: '--newSiteTitle [newSiteTitle]'
+        option: '--newTitle [newTitle]'
     }, {
         option: '--suppressMarketplaceAppCheck'
     }, {
@@ -149,7 +149,7 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
     });
 }, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.siteUrl.toLowerCase() === args.options.newSiteUrl.toLowerCase()) {
+        if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
         }
         return true;