@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.01ba480

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

@@ -35,7 +35,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
@@ -57,7 +57,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

@@ -36,8 +36,8 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            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}`);
                     }
                 }
             }
@@ -78,7 +78,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

@@ -38,8 +38,8 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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 = {
@@ -73,7 +73,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

@@ -36,8 +36,8 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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';
             }
             try {
@@ -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

@@ -37,7 +37,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let pageFullName = args.options.name.toLowerCase();
+            let pageFullName = args.options.pageName.toLowerCase();
             if (pageFullName.indexOf('.aspx') < 0) {
                 pageFullName += '.aspx';
             }
@@ -172,7 +172,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

@@ -35,7 +35,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 const isJSONOutput = args.options.output === 'json';
@@ -53,7 +53,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

@@ -35,7 +35,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const clientSidePage = yield Page_1.Page.getPage(args.options.name, args.options.webUrl, logger, this.debug, this.verbose);
+                const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections;
                 const isJSONOutput = args.options.output === 'json';
                 if (sections.length) {
@@ -63,7 +63,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 validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -18,7 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -48,14 +50,25 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const res = yield request_1.default.get(requestOptions);
+                const response = this.setFriendlyPermissions(res.value);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            const permissions = new base_permissions_1.BasePermissions();
+            permissions.high = r.BasePermissions.High;
+            permissions.low = r.BasePermissions.Low;
+            r.BasePermissionsValue = permissions.parse();
+            r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+        });
+        return response;
+    }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
     this.options.unshift({

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

@@ -49,7 +49,7 @@ class SpoServicePrincipalGrantRevokeCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.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">${formatting_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">${formatting_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -66,7 +66,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

@@ -51,7 +51,7 @@ class SpoServicePrincipalPermissionRequestApproveCommand extends SpoCommand_1.de
                     headers: {
                         'X-RequestDigest': reqDigest.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">{${formatting_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">{${formatting_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Method Id="21" ParentId="19" Name="Approve" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -73,12 +73,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 (!validation_1.validation.isValidGuid(args.options.requestId)) {
-            return `${args.options.requestId} is not a valid GUID`;
+        if (!validation_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

@@ -51,7 +51,7 @@ class SpoServicePrincipalPermissionRequestDenyCommand extends SpoCommand_1.defau
                     headers: {
                         'X-RequestDigest': reqDigest.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">{${formatting_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">{${formatting_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -68,12 +68,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 (!validation_1.validation.isValidGuid(args.options.requestId)) {
-            return `${args.options.requestId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -59,9 +58,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             const isTeamSite = args.options.type !== 'CommunicationSite';
             try {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
-                if (args.options.allowFileSharingForGuestUsers && this.verbose) {
-                    logger.logToStderr(chalk.yellow(`Option 'allowFileSharingForGuestUsers' is deprecated. Please use 'shareByEmailEnabled' instead`));
-                }
                 if (this.verbose) {
                     logger.logToStderr(`Creating new site...`);
                 }
@@ -130,7 +126,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             request: {
                                 Title: args.options.title,
                                 Url: args.options.url,
-                                ShareByEmailEnabled: args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers,
+                                ShareByEmailEnabled: args.options.shareByEmailEnabled,
                                 Description: args.options.description || '',
                                 Classification: args.options.classification || '',
                                 WebTemplate: 'SITEPAGEPUBLISHING#0',
@@ -388,7 +384,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         telemetryProps.lcid = args.options.lcid;
         telemetryProps.owners = typeof args.options.owners !== 'undefined';
         if (isCommunicationSite) {
-            telemetryProps.allowFileSharingForGuestUsers = args.options.allowFileSharingForGuestUsers || false;
             telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
             telemetryProps.siteDesign = args.options.siteDesign;
             telemetryProps.siteDesignId = (!(!args.options.siteDesignId)).toString();
@@ -431,8 +426,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         autocomplete: ['Topic', 'Showcase', 'Blank']
     }, {
         option: '--siteDesignId [siteDesignId]'
-    }, {
-        option: '--allowFileSharingForGuestUsers'
     }, {
         option: '--shareByEmailEnabled'
     }, {
@@ -466,7 +459,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (!args.options.alias) {
                 return 'Required option alias missing';
             }
-            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
+            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
                 return "Type TeamSite supports only the parameters title, lcid, alias, owners, classification, isPublic, and description";
             }
         }
@@ -497,7 +490,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
                 return 'Specify siteDesign or siteDesignId but not both';
             }
             if (args.options.timeZone || args.options.isPublic || args.options.removeDeletedSite || args.options.wait || args.options.alias || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
-                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, allowFileSharingForGuestUsers, siteDesignId, owners, and description";
+                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, siteDesignId, owners, and description";
             }
         }
         else {
@@ -550,7 +543,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (args.options.storageQuotaWarningLevel > args.options.storageQuota) {
                 return `storageQuotaWarningLevel cannot exceed storageQuota`;
             }
-            if (args.options.classification || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
+            if (args.options.classification || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
                 return "Type ClassicSite supports only the parameters url, title, lcid, storageQuota, storageQuotaWarningLevel, resourceQuota, resourceQuotaWarningLevel, webTemplate, owners, and description";
             }
         }

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

@@ -37,7 +37,7 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = args.options.url;
+            const url = args.options.siteUrl;
             try {
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const requestDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
@@ -71,10 +71,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 validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_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

@@ -37,7 +37,7 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = args.options.url;
+            const url = args.options.siteUrl;
             try {
                 const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const requestDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
@@ -71,10 +71,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 validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_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'
             },
@@ -81,7 +81,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 validation_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()
@@ -133,7 +133,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()
         });
     });
@@ -141,7 +141,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --permissionId [permissionId]'
+        option: '-i, --id [id]'
     }, {
         option: '--appId [appId]'
     }, {
@@ -157,7 +157,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
         return validation_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

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

@@ -59,8 +59,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',
             permissions: args.options.permissions
@@ -120,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]'
     }, {
@@ -140,7 +140,7 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionSetCommand_initOptionSets = function _SpoSiteAppPermissionSetCommand_initOptionSets() {
-    this.optionSets.push(['permissionId', 'appId', 'appDisplayName']);
+    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

@@ -94,7 +94,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'
                 },
@@ -125,7 +125,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']
@@ -150,7 +150,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 = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -115,7 +115,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

@@ -52,7 +52,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',
@@ -82,7 +82,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>'
     }, {
@@ -97,7 +97,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 validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-connect.js → site/site-hubsite-connect.js}

@@ -13,22 +13,22 @@ 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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
+var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteConnectCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteConnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+        _SpoSiteHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_CONNECT;
+        return commands_1.default.SITE_HUBSITE_CONNECT;
     }
     get description() {
         return 'Connects the specified site collection to the given hub site';
@@ -36,9 +36,9 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield spo_1.spo.getRequestDigest(args.options.url);
+                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                 const requestOptions = {
-                    url: `${args.options.url}/_api/site/JoinHubSite('${encodeURIComponent(args.options.hubSiteId)}')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -53,23 +53,23 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+_SpoSiteHubSiteConnectCommand_instances = new WeakSet(), _SpoSiteHubSiteConnectCommand_initOptions = function _SpoSiteHubSiteConnectCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-i, --hubSiteId <hubSiteId>'
+        option: '-i, --id <id>'
     });
-}, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
+}, _SpoSiteHubSiteConnectCommand_initValidators = function _SpoSiteHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!validation_1.validation.isValidGuid(args.options.hubSiteId)) {
-            return `${args.options.hubSiteId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
 };
-module.exports = new SpoHubSiteConnectCommand();
-//# sourceMappingURL=hubsite-connect.js.map
+module.exports = new SpoSiteHubSiteConnectCommand();
+//# sourceMappingURL=site-hubsite-connect.js.map