@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageListCommand_instances, _SpoPageListCommand_initOptions, _SpoPageListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,28 +41,14 @@ class SpoPageListCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving client-side pages...`);
                 }
-                let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
                 let pages = [];
-                const pagesList = yield request_1.default.get(requestOptions);
-                requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                if (pagesList.value && pagesList.value.length > 0) {
-                    pages = pagesList.value;
+                const pagesList = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages?$orderby=Title`);
+                if (pagesList && pagesList.length > 0) {
+                    pages = pagesList;
                 }
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    const clientSidePages = res.value.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists/SitePages/rootfolder/files?$expand=ListItemAllFields/ClientSideApplicationId&$orderby=Name`);
+                if (res && res.length > 0) {
+                    const clientSidePages = res.filter(p => p.ListItemAllFields.ClientSideApplicationId === 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec');
                     pages = pages.map(p => {
                         const clientSidePage = clientSidePages.find(cp => cp && cp.ListItemAllFields && cp.ListItemAllFields.Id === p.Id);
                         if (clientSidePage) {

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

@@ -17,6 +17,7 @@ var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,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';
             }
@@ -47,7 +48,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -57,7 +58,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
                 if (!res.IsPageCheckedOutToCurrentUser) {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -88,7 +89,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 }
                 canvasContent.splice(pos, 0, ...columnsToAdd);
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/savepage`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/savepage`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata'
@@ -172,7 +173,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/page/page-set.js

@@ -17,12 +17,16 @@ var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const Page_1 = require("./Page");
+const spoFileGetCommand = require("../file/file-get");
+const spoListItemSetCommand = require("../listitem/listitem-set");
+const Cli_1 = require("../../../../cli/Cli");
 class SpoPageSetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -54,7 +58,8 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             if (!pageName.endsWith('.aspx')) {
                 pageName += '.aspx';
             }
-            const serverRelativeFileUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}`;
+            const listServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
+            const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
             const needsToSavePage = !!args.options.title || !!args.options.description;
             try {
                 const requestDigestResult = yield spo_1.spo.getRequestDigest(args.options.webUrl);
@@ -232,6 +237,27 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                     };
                     yield request_1.default.post(requestOptions);
                 }
+                if (args.options.demoteFrom === 'NewsPage') {
+                    const fileGetOptions = {
+                        webUrl: args.options.webUrl,
+                        url: serverRelativeFileUrl,
+                        asListItem: true,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    const fileGetOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileGetCommand, { options: Object.assign(Object.assign({}, fileGetOptions), { _: [] }) });
+                    const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
+                    const listItemSetOptions = {
+                        webUrl: args.options.webUrl,
+                        listUrl: listServerRelativeUrl,
+                        id: fileGetOutputJson.Id,
+                        systemUpdate: true,
+                        PromotedState: 0,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    };
+                    yield Cli_1.Cli.executeCommandWithOutput(spoListItemSetCommand, { options: Object.assign(Object.assign({}, listItemSetOptions), { _: [] }) });
+                }
                 let requestOptions;
                 if (!args.options.publish) {
                     if (args.options.promoteAs === 'Template' || !pageId) {
@@ -249,7 +275,7 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                 }
                 else {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -269,8 +295,9 @@ class SpoPageSetCommand extends SpoCommand_1.default {
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            layoutType: args.options.layoutType,
-            promoteAs: args.options.promoteAs,
+            layoutType: args.options.layoutType || false,
+            promoteAs: args.options.promoteAs || false,
+            demotefrom: args.options.demoteFrom || false,
             commentsEnabled: args.options.commentsEnabled || false,
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
@@ -289,6 +316,9 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
     }, {
         option: '-p, --promoteAs [promoteAs]',
         autocomplete: Page_1.supportedPromoteAs
+    }, {
+        option: '--demoteFrom [demoteFrom]',
+        autocomplete: ['NewsPage']
     }, {
         option: '--commentsEnabled [commentsEnabled]',
         autocomplete: ['true', 'false']
@@ -315,6 +345,10 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             Page_1.supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
             return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${Page_1.supportedPromoteAs.join(', ')}`;
         }
+        if (args.options.demoteFrom &&
+            args.options.demoteFrom !== 'NewsPage') {
+            return `${args.options.demoteFrom} is not a valid option for demoteFrom. The only allowed value is 'NewsPage'`;
+        }
         if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
             return 'You can only promote home pages as site home page';
         }

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageTemplateListCommand_instances, _SpoPageTemplateListCommand_initOptions, _SpoPageTemplateListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,17 +40,10 @@ class SpoPageTemplateListCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving templates...`);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/sitepages/pages/templates`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                if (res.value && res.value.length > 0) {
-                    logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
+                if (res && res.length > 0) {
+                    logger.log(res);
                 }
             }
             catch (err) {

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

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoRoleDefinitionListCommand_instances, _SpoRoleDefinitionListCommand_initOptions, _SpoRoleDefinitionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 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();
@@ -40,22 +42,26 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Getting role definitions list from ${args.options.webUrl}...`);
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/roledefinitions`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/roledefinitions`);
+                const response = this.setFriendlyPermissions(res);
+                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-add.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators, _SpoSiteAppPermissionAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -58,10 +59,10 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         }
         let endpoint = "";
         if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         else {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         const appRequestOptions = {
             url: endpoint,
@@ -179,7 +180,7 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appDisplayName']);
+    this.optionSets.push({ options: ['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'
             },
@@ -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({ options: ['appId', 'appDisplayName', 'id'] });
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map