@pnp/cli-microsoft365 5.7.0-beta.c116041 → 6.0.0-beta.22bbec5

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

@@ -70,8 +70,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 +138,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 +146,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,13 +156,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.id) {
+            return `Specify appId, appDisplayName, or id. 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';
+            (args.options.appId && args.options.id) ||
+            (args.options.id && args.options.appDisplayName)) {
+            return 'Use either appId, appDisplayName, or id, but not multiple';
         }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;

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

@@ -57,8 +57,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 +110,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 +119,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,8 +129,8 @@ _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.id && !args.options.appId && !args.options.appDisplayName) {
+            return `Specify id, 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`;

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;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-grant.js

@@ -50,7 +50,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    id: args.options.id,
+                    id: args.options.siteDesignId,
                     principalNames: args.options.principals.split(',').map(p => p.trim()),
                     grantedRights: grantedRights
                 },
@@ -63,7 +63,7 @@ class SpoSiteDesignRightsGrantCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRightsGrantCommand_initOptions = function _SpoSiteDesignRightsGrantCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -72,8 +72,8 @@ _SpoSiteDesignRightsGrantCommand_instances = new WeakSet(), _SpoSiteDesignRights
     });
 }, _SpoSiteDesignRightsGrantCommand_initValidators = function _SpoSiteDesignRightsGrantCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         if (args.options.rights !== 'View') {
             return `${args.options.rights} is not a valid rights value. Allowed values View`;

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-list.js

@@ -48,7 +48,7 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'
                 },
-                data: { id: args.options.id },
+                data: { id: args.options.siteDesignId },
                 responseType: 'json'
             };
             return request_1.default.post(requestOptions);
@@ -64,12 +64,12 @@ class SpoSiteDesignRightsListCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignRightsListCommand_instances = new WeakSet(), _SpoSiteDesignRightsListCommand_initOptions = function _SpoSiteDesignRightsListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     });
 }, _SpoSiteDesignRightsListCommand_initValidators = function _SpoSiteDesignRightsListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -52,7 +52,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        id: args.options.id,
+                        id: args.options.siteDesignId,
                         principalNames: args.options.principals.split(',').map(p => p.trim())
                     },
                     responseType: 'json'
@@ -69,7 +69,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to revoke access to site design ${args.options.id} from the specified users?`
+                message: `Are you sure you want to revoke access to site design ${args.options.siteDesignId} from the specified users?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -89,7 +89,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initOptions = function _SpoSiteDesignRightsRevokeCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --siteDesignId <siteDesignId>'
     }, {
         option: '-p, --principals <principals>'
     }, {
@@ -97,8 +97,8 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            return `${args.options.siteDesignId} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/spo/commands/sitedesign/sitedesign-task-get.js

@@ -42,7 +42,7 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    taskId: args.options.taskId
+                    taskId: args.options.id
                 },
                 responseType: 'json'
             };
@@ -58,12 +58,12 @@ class SpoSiteDesignTaskGetCommand extends SpoCommand_1.default {
 }
 _SpoSiteDesignTaskGetCommand_instances = new WeakSet(), _SpoSiteDesignTaskGetCommand_initOptions = function _SpoSiteDesignTaskGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     });
 }, _SpoSiteDesignTaskGetCommand_initValidators = function _SpoSiteDesignTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} 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/sitedesign/sitedesign-task-remove.js

@@ -45,7 +45,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                         accept: 'application/json;odata=nometadata'
                     },
                     data: {
-                        taskId: args.options.taskId
+                        taskId: args.options.id
                     },
                     responseType: 'json'
                 };
@@ -61,7 +61,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the site design task ${args.options.taskId}?`
+                message: `Are you sure you want to remove the site design task ${args.options.id}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -81,14 +81,14 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} 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/tenant/tenant-recyclebinitem-remove.js

@@ -46,14 +46,14 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 .then((res) => {
                 this.context = res;
                 if (this.verbose) {
-                    logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
+                    logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
                 }
                 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_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -97,7 +97,7 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
+                message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -118,14 +118,14 @@ _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecyc
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initOptions = function _SpoTenantRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     }, {
         option: '--confirm'
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_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 SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

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

@@ -44,7 +44,7 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
                     'content-type': 'application/json;charset=utf-8'
                 },
                 data: {
-                    siteUrl: args.options.url
+                    siteUrl: args.options.siteUrl
                 }
             };
             return request_1.default.post(requestOptions);
@@ -63,12 +63,12 @@ _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecy
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_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 SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map