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

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,7 +15,7 @@ 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");
@@ -42,16 +42,9 @@ 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 res = yield request_1.default.get(requestOptions);
-                const response = this.setFriendlyPermissions(res.value);
+                const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/roledefinitions`);
+                const response = this.setFriendlyPermissions(res);
                 logger.log(response);
             }
             catch (err) {

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

@@ -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', 'id']);
+    this.optionSets.push({ options: ['appId', 'appDisplayName', 'id'] });
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map

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

@@ -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(['id', 'appId', 'appDisplayName']);
+    this.optionSets.push({ options: ['id', 'appId', 'appDisplayName'] });
 };
 module.exports = new SpoSiteAppPermissionSetCommand();
 //# sourceMappingURL=site-apppermission-set.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -38,7 +39,7 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
             try {
                 const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                 const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -91,7 +92,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             iteration++;
             const requestOptions = {
-                url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${encodeURIComponent(siteUrl)}')?api-version=1.4.7`,
+                url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${formatting_1.formatting.encodeQueryParameter(siteUrl)}')?api-version=1.4.7`,
                 headers: {
                     'X-AttemptNumber': iteration.toString()
                 },

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

@@ -382,7 +382,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${encodeURIComponent(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         });

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators;
+var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
@@ -27,6 +27,7 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITEDESIGN_GET;
@@ -96,17 +97,13 @@ _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_ini
     });
 }, _SpoSiteDesignGetCommand_initValidators = function _SpoSiteDesignGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title, but not both.';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoSiteDesignGetCommand_initOptionSets = function _SpoSiteDesignGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoSiteDesignGetCommand();
 //# sourceMappingURL=sitedesign-get.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptAddCommand_instances, _SpoSiteScriptAddCommand_initTelemetry, _SpoSiteScriptAddCommand_initOptions, _SpoSiteScriptAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoSiteScriptAddCommand extends SpoCommand_1.default {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
-                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${encodeURIComponent(args.options.title)}'&@description='${encodeURIComponent(args.options.description || '')}'`,
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${formatting_1.formatting.encodeQueryParameter(args.options.title)}'&@description='${formatting_1.formatting.encodeQueryParameter(args.options.description || '')}'`,
                     headers: {
                         'X-RequestDigest': requestDigest.FormDigestValue,
                         'content-type': 'application/json;charset=utf-8',

package/dist/m365/spo/commands/spo-search.js

@@ -17,6 +17,7 @@ var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../request");
+const formatting_1 = require("../../../utils/formatting");
 const spo_1 = require("../../../utils/spo");
 const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
@@ -88,7 +89,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         // get the list of selected properties
         const selectPropertiesArray = this.getSelectPropertiesArray(args);
         // transform arg data to query string parameters
-        const propertySelectRequestString = `&selectproperties='${encodeURIComponent(selectPropertiesArray.join(","))}'`;
+        const propertySelectRequestString = `&selectproperties='${formatting_1.formatting.encodeQueryParameter(selectPropertiesArray.join(","))}'`;
         const startRowRequestString = `&startrow=${startRow ? startRow : 0}`;
         const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : ``;
         const sourceIdRequestString = args.options.sourceId ? `&sourceid='${args.options.sourceId}'` : ``;
@@ -97,7 +98,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         const cultureRequestString = args.options.culture ? `&culture=${args.options.culture}` : ``;
         const refinementFiltersRequestString = args.options.refinementFilters ? `&refinementfilters='${args.options.refinementFilters}'` : ``;
         const queryTemplateRequestString = args.options.queryTemplate ? `&querytemplate='${args.options.queryTemplate}'` : ``;
-        const sortListRequestString = args.options.sortList ? `&sortList='${encodeURIComponent(args.options.sortList)}'` : ``;
+        const sortListRequestString = args.options.sortList ? `&sortList='${formatting_1.formatting.encodeQueryParameter(args.options.sortList)}'` : ``;
         const rankingModelIdRequestString = args.options.rankingModelId ? `&rankingmodelid='${args.options.rankingModelId}'` : ``;
         const propertiesRequestString = this.getPropertiesRequestString(args);
         const refinersRequestString = args.options.refiners ? `&refiners='${args.options.refiners}'` : ``;

package/dist/m365/spo/commands/storageentity/storageentity-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityGetCommand_instances, _SpoStorageEntityGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,7 +37,7 @@ class SpoStorageEntityGetCommand extends SpoCommand_1.default {
             try {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
-                    url: `${spoUrl}/_api/web/GetStorageEntity('${encodeURIComponent(args.options.key)}')`,
+                    url: `${spoUrl}/_api/web/GetStorageEntity('${formatting_1.formatting.encodeQueryParameter(args.options.key)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -222,7 +222,7 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
         return true;
     }));
 }, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

package/dist/m365/spo/commands/term/term-get.js

@@ -143,7 +143,7 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
         return true;
     }));
 }, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/term/term-group-get.js

@@ -96,7 +96,7 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
         return true;
     }));
 }, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

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

@@ -113,7 +113,7 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         return true;
     }));
 }, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName'], ['termSetId', 'termSetName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] }, { options: ['termSetId', 'termSetName'] });
 };
 module.exports = new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map

package/dist/m365/spo/commands/term/term-set-add.js

@@ -171,7 +171,7 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
         return true;
     }));
 }, _SpoTermSetAddCommand_initOptionSets = function _SpoTermSetAddCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetAddCommand();
 //# sourceMappingURL=term-set-add.js.map

package/dist/m365/spo/commands/term/term-set-get.js

@@ -108,7 +108,7 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
         return true;
     }));
 }, _SpoTermSetGetCommand_initOptionSets = function _SpoTermSetGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name'], ['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['id', 'name'] }, { options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetGetCommand();
 //# sourceMappingURL=term-set-get.js.map

package/dist/m365/spo/commands/term/term-set-list.js

@@ -102,7 +102,7 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
         return true;
     }));
 }, _SpoTermSetListCommand_initOptionSets = function _SpoTermSetListCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetListCommand();
 //# sourceMappingURL=term-set-list.js.map

package/dist/m365/spo/commands/user/user-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,13 +42,13 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.email) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${encodeURIComponent(args.options.email)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(args.options.email)}')`;
             }
             else if (args.options.loginName) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${encodeURIComponent(args.options.loginName)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -94,7 +95,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'email', 'loginName']);
+    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands/user/user-remove.js

@@ -17,6 +17,7 @@ var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUs
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 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");
@@ -46,7 +47,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
                     requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
                 }
                 if (args.options.loginName) {
-                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
                 }
                 const requestOptions = {
                     url: requestUrl,
@@ -102,7 +103,7 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'loginName']);
+    this.optionSets.push({ options: ['id', 'loginName'] });
 };
 module.exports = new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -39,7 +40,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const userName = `i:0#.f|membership|${args.options.userName}`;
                 const requestOptions = {
-                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${formatting_1.formatting.encodeQueryParameter(`${userName}`)}'`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -17,6 +17,7 @@ var _SpoWebAddCommand_instances, _SpoWebAddCommand_initTelemetry, _SpoWebAddComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -72,7 +73,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                     if (this.verbose) {
                         logger.logToStderr("Setting inheriting navigation from the parent site...");
                     }
-                    subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
+                    subsiteFullUrl = `${args.options.parentWebUrl}/${formatting_1.formatting.encodeQueryParameter(args.options.url)}`;
                     const requestOptionsPer = {
                         url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                         headers: {

package/dist/m365/spo/commands/web/web-get.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("../roledefinition/RoleType");
 class SpoWebGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -48,6 +50,12 @@ class SpoWebGetCommand extends SpoCommand_1.default {
             };
             try {
                 const webProperties = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    requestOptions.url = `${args.options.url}/_api/web/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    const response = yield request_1.default.get(requestOptions);
+                    const roleAssignments = this.setFriendlyPermissions(response.value);
+                    webProperties.RoleAssignments = roleAssignments;
+                }
                 logger.log(webProperties);
             }
             catch (err) {
@@ -55,11 +63,24 @@ class SpoWebGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            r.RoleDefinitionBindings.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;
+    }
 }
 _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = function _SpoWebGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            withGroups: typeof args.options.withGroups !== 'undefined'
+            withGroups: !!args.options.withGroups,
+            withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoWebGetCommand_initOptions = function _SpoWebGetCommand_initOptions() {
@@ -67,6 +88,8 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
         option: '-u, --url <url>'
     }, {
         option: '--withGroups'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebListCommand_instances, _SpoWebListCommand_initOptions, _SpoWebListCommand_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");
@@ -44,16 +44,9 @@ class SpoWebListCommand extends SpoCommand_1.default {
             if (args.options.output !== 'json') {
                 requestUrl += '?$select=Title,Id,URL';
             }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const webProperties = yield request_1.default.get(requestOptions);
-                logger.log(webProperties.value);
+                const webProperties = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(webProperties);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);