@pnp/cli-microsoft365 6.0.0-beta.b62b543 → 6.0.0-beta.ba3c436

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoGroupGetCommand_instances, _SpoGroupGetCommand_initTelemetry, _SpoGroupGetCommand_initOptions, _SpoGroupGetCommand_initValidators, _SpoGroupGetCommand_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,10 +42,10 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${args.options.id}')`;
             }
             else if (args.options.name) {
-                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.name)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.name)}')`;
             }
             else if (args.options.associatedGroup) {
                 switch (args.options.associatedGroup.toLowerCase()) {

package/dist/m365/spo/commands/group/{group-user-add.js → group-member-add.js}

@@ -13,28 +13,29 @@ 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 _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_initTelemetry, _SpoGroupUserAddCommand_initOptions, _SpoGroupUserAddCommand_initValidators, _SpoGroupUserAddCommand_initOptionSets;
+var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
 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 AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoGroupUserAddCommand extends SpoCommand_1.default {
+class SpoGroupMemberAddCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoGroupUserAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserAddCommand_instances, "m", _SpoGroupUserAddCommand_initOptionSets).call(this);
+        _SpoGroupMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptionSets).call(this);
     }
     get name() {
-        return commands_1.default.GROUP_USER_ADD;
+        return commands_1.default.GROUP_MEMBER_ADD;
     }
     get description() {
-        return 'Add a user or multiple users to SharePoint Group';
+        return 'Add members to a SharePoint Group';
     }
     defaultProperties() {
         return ['DisplayName', 'Email'];
@@ -74,7 +75,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
     }
     getGroupId(args) {
         const getGroupMethod = args.options.groupName ?
-            `GetByName('${encodeURIComponent(args.options.groupName)}')` :
+            `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,
@@ -141,7 +142,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         return generatedPeoplePicker;
     }
 }
-_SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initTelemetry = function _SpoGroupUserAddCommand_initTelemetry() {
+_SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_initTelemetry = function _SpoGroupMemberAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -150,7 +151,7 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
             email: typeof args.options.email !== 'undefined'
         });
     });
-}, _SpoGroupUserAddCommand_initOptions = function _SpoGroupUserAddCommand_initOptions() {
+}, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -162,7 +163,7 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
     }, {
         option: '--email [email]'
     });
-}, _SpoGroupUserAddCommand_initValidators = function _SpoGroupUserAddCommand_initValidators() {
+}, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
@@ -173,8 +174,8 @@ _SpoGroupUserAddCommand_instances = new WeakSet(), _SpoGroupUserAddCommand_initT
         }
         return true;
     }));
-}, _SpoGroupUserAddCommand_initOptionSets = function _SpoGroupUserAddCommand_initOptionSets() {
+}, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
     this.optionSets.push(['groupId', 'groupName'], ['userName', 'email']);
 };
-module.exports = new SpoGroupUserAddCommand();
-//# sourceMappingURL=group-user-add.js.map
+module.exports = new SpoGroupMemberAddCommand();
+//# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/group/{group-user-list.js → group-member-list.js}

@@ -13,26 +13,27 @@ 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 _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
+var _SpoGroupMemberListCommand_instances, _SpoGroupMemberListCommand_initTelemetry, _SpoGroupMemberListCommand_initOptions, _SpoGroupMemberListCommand_initValidators, _SpoGroupMemberListCommand_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");
-class SpoGroupUserListCommand extends SpoCommand_1.default {
+class SpoGroupMemberListCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoGroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserListCommand_instances, "m", _SpoGroupUserListCommand_initOptionSets).call(this);
+        _SpoGroupMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberListCommand_instances, "m", _SpoGroupMemberListCommand_initOptionSets).call(this);
     }
     get name() {
-        return commands_1.default.GROUP_USER_LIST;
+        return commands_1.default.GROUP_MEMBER_LIST;
     }
     get description() {
-        return `List members of a SharePoint Group`;
+        return `List the members of a SharePoint Group`;
     }
     defaultProperties() {
         return ['Title', 'UserPrincipalName', 'Id', 'Email'];
@@ -43,8 +44,8 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving the list of members from the SharePoint group :  ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
             }
             const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users`;
+                ? `GetById('${args.options.groupId}')`
+                : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -54,7 +55,7 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
             };
             try {
                 const response = yield request_1.default.get(requestOptions);
-                logger.log(response);
+                logger.log(response.value);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -62,14 +63,14 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_initTelemetry = function _SpoGroupUserListCommand_initTelemetry() {
+_SpoGroupMemberListCommand_instances = new WeakSet(), _SpoGroupMemberListCommand_initTelemetry = function _SpoGroupMemberListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined'
         });
     });
-}, _SpoGroupUserListCommand_initOptions = function _SpoGroupUserListCommand_initOptions() {
+}, _SpoGroupMemberListCommand_initOptions = function _SpoGroupMemberListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -77,15 +78,15 @@ _SpoGroupUserListCommand_instances = new WeakSet(), _SpoGroupUserListCommand_ini
     }, {
         option: '--groupName [groupName]'
     });
-}, _SpoGroupUserListCommand_initValidators = function _SpoGroupUserListCommand_initValidators() {
+}, _SpoGroupMemberListCommand_initValidators = function _SpoGroupMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoGroupUserListCommand_initOptionSets = function _SpoGroupUserListCommand_initOptionSets() {
+}, _SpoGroupMemberListCommand_initOptionSets = function _SpoGroupMemberListCommand_initOptionSets() {
     this.optionSets.push(['groupName', 'groupId']);
 };
-module.exports = new SpoGroupUserListCommand();
-//# sourceMappingURL=group-user-list.js.map
+module.exports = new SpoGroupMemberListCommand();
+//# sourceMappingURL=group-member-list.js.map

package/dist/m365/spo/commands/group/{group-user-remove.js → group-member-remove.js}

@@ -13,27 +13,28 @@ 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 _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemetry, _SpoGroupUserRemoveCommand_initOptions, _SpoGroupUserRemoveCommand_initValidators, _SpoGroupUserRemoveCommand_initOptionSets;
+var _SpoGroupMemberRemoveCommand_instances, _SpoGroupMemberRemoveCommand_initTelemetry, _SpoGroupMemberRemoveCommand_initOptions, _SpoGroupMemberRemoveCommand_initValidators, _SpoGroupMemberRemoveCommand_initOptionSets;
 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");
-class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
+class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoGroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoGroupUserRemoveCommand_instances, "m", _SpoGroupUserRemoveCommand_initOptionSets).call(this);
+        _SpoGroupMemberRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberRemoveCommand_instances, "m", _SpoGroupMemberRemoveCommand_initOptionSets).call(this);
     }
     get name() {
-        return commands_1.default.GROUP_USER_REMOVE;
+        return commands_1.default.GROUP_MEMBER_REMOVE;
     }
     get description() {
-        return 'Removes the specified user from a SharePoint group';
+        return 'Removes the specified member from a SharePoint group';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,8 +44,8 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
                 }
                 const loginName = `i:0#.f|membership|${args.options.userName}`;
                 const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                    ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                    : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+                    ? `GetById('${args.options.groupId}')`
+                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -79,7 +80,7 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand_initTelemetry = function _SpoGroupUserRemoveCommand_initTelemetry() {
+_SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCommand_initTelemetry = function _SpoGroupMemberRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: (!(!args.options.groupId)).toString(),
@@ -87,7 +88,7 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
             confirm: (!(!args.options.confirm)).toString()
         });
     });
-}, _SpoGroupUserRemoveCommand_initOptions = function _SpoGroupUserRemoveCommand_initOptions() {
+}, _SpoGroupMemberRemoveCommand_initOptions = function _SpoGroupMemberRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -99,15 +100,15 @@ _SpoGroupUserRemoveCommand_instances = new WeakSet(), _SpoGroupUserRemoveCommand
     }, {
         option: '--confirm'
     });
-}, _SpoGroupUserRemoveCommand_initValidators = function _SpoGroupUserRemoveCommand_initValidators() {
+}, _SpoGroupMemberRemoveCommand_initValidators = function _SpoGroupMemberRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
-}, _SpoGroupUserRemoveCommand_initOptionSets = function _SpoGroupUserRemoveCommand_initOptionSets() {
+}, _SpoGroupMemberRemoveCommand_initOptionSets = function _SpoGroupMemberRemoveCommand_initOptionSets() {
     this.optionSets.push(['groupName', 'groupId']);
 };
-module.exports = new SpoGroupUserRemoveCommand();
-//# sourceMappingURL=group-user-remove.js.map
+module.exports = new SpoGroupMemberRemoveCommand();
+//# sourceMappingURL=group-member-remove.js.map

package/dist/m365/spo/commands/list/list-contenttype-remove.js

@@ -57,7 +57,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
                 const requestOptions = {
-                    url: `${requestUrl}/ContentTypes('${encodeURIComponent(args.options.id)}')`,
+                    url: `${requestUrl}/ContentTypes('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`,
                     headers: {
                         'X-HTTP-Method': 'DELETE',
                         'If-Match': '*',

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

@@ -48,7 +48,7 @@ class SpoListGetCommand extends SpoCommand_1.default {
             else {
                 requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
             }
-            let propertiesSelect = args.options.properties ? `?$select=${encodeURIComponent(args.options.properties)}` : ``;
+            let propertiesSelect = args.options.properties ? `?$select=${formatting_1.formatting.encodeQueryParameter(args.options.properties)}` : ``;
             propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
             const requestOptions = {
                 url: requestUrl + propertiesSelect,

package/dist/m365/spo/commands/list/list-view-field-add.js

@@ -101,7 +101,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,

package/dist/m365/spo/commands/list/list-view-field-remove.js

@@ -92,7 +92,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,

package/dist/m365/spo/commands/list/list-view-field-set.js

@@ -78,7 +78,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,

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

@@ -59,7 +59,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -68,7 +68,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 let res;
                 if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
                     const rowLimit = `$top=${Number(args.options.pageSize) * Number(args.options.pageNumber)}`;
-                    const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                    const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                     const fieldSelect = `?$select=Id&${rowLimit}&${filter}`;
                     const requestOptions = {
                         url: `${requestUrl}/items${fieldSelect}`,
@@ -83,10 +83,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 const skipTokenId = (res && res.value && res.value.length && res.value[res.value.length - 1]) ? res.value[res.value.length - 1].Id : 0;
                 const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
                 const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
-                const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+                const filter = args.options.filter ? `$filter=${formatting_1.formatting.encodeQueryParameter(args.options.filter)}` : ``;
                 const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
                 const fieldSelect = fieldsArray.length > 0 ?
-                    `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
+                    `?$select=${formatting_1.formatting.encodeQueryParameter(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                     `?${rowLimit}&${skipToken}&${filter}`;
                 const requestBody = args.options.camlQuery ?
                     {

package/dist/m365/spo/commands/page/Page.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const clientsidepages_1 = require("./clientsidepages");
 const pageMethods_1 = require("./pageMethods");
@@ -15,7 +16,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+                url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${formatting_1.formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'
@@ -47,7 +48,7 @@ class Page {
             }
             const pageName = this.getPageNameWithExtension(name);
             const requestOptions = {
-                url: `${webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/checkoutpage`,
+                url: `${webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')/checkoutpage`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -17,6 +17,7 @@ var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddC
 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");
@@ -246,7 +247,7 @@ class SpoPageAddCommand extends SpoCommand_1.default {
                 }
                 else {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyid('${itemId}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const uuid_1 = require("uuid");
 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");
@@ -56,7 +57,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -65,7 +66,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                 let page = yield request_1.default.get(requestOptions);
                 if (!page.IsPageCheckedOutToCurrentUser) {
                     const 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'
                         },
@@ -216,7 +217,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand_1.default {
                     pageData.CanvasContent1 = JSON.stringify(canvasContent);
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',

package/dist/m365/spo/commands/page/page-control-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlGetCommand_instances, _SpoPageControlGetCommand_initOptions, _SpoPageControlGetCommand_initValidators;
 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,7 +42,7 @@ class SpoPageControlGetCommand extends SpoCommand_1.default {
                 pageName += '.aspx';
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlListCommand_instances, _SpoPageControlListCommand_initOptions, _SpoPageControlListCommand_initValidators;
 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");
@@ -43,7 +44,7 @@ class SpoPageControlListCommand extends SpoCommand_1.default {
                 pageName += '.aspx';
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },

package/dist/m365/spo/commands/page/page-control-set.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageControlSetCommand_instances, _SpoPageControlSetCommand_initTelemetry, _SpoPageControlSetCommand_initOptions, _SpoPageControlSetCommand_initValidators;
 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");
@@ -42,7 +43,7 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')`,
+                    url: `${args.options.webUrl}/_api/SitePages/Pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -122,7 +123,7 @@ class SpoPageControlSetCommand extends SpoCommand_1.default {
                     pageData.CanvasContent1 = JSON.stringify(canvasContent);
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageGetCommand_instances, _SpoPageGetCommand_initOptions, _SpoPageGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -47,7 +48,7 @@ class SpoPageGetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${encodeURIComponent(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${formatting_1.formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
                     headers: {
                         'content-type': 'application/json;charset=utf-8',
                         accept: 'application/json;odata=nometadata'

package/dist/m365/spo/commands/page/page-header-set.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoPageHeaderSetCommand_instances, _SpoPageHeaderSetCommand_initTelemetry, _SpoPageHeaderSetCommand_initOptions, _SpoPageHeaderSetCommand_initValidators;
 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");
@@ -138,7 +139,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$select=IsPageCheckedOutToCurrentUser,Title`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -149,7 +150,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                 let pageData;
                 if (page.IsPageCheckedOutToCurrentUser) {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$expand=ListItemAllFields`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$expand=ListItemAllFields`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -159,7 +160,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                 }
                 else {
                     const 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'
                         },
@@ -264,7 +265,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
                     requestBody.CanvasContent1 = canvasContent;
                 }
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/SavePageAsDraft`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/SavePageAsDraft`,
                     headers: {
                         'X-HTTP-Method': 'MERGE',
                         'IF-MATCH': '*',
@@ -312,7 +313,7 @@ class SpoPageHeaderSetCommand extends SpoCommand_1.default {
             logger.logToStderr(`Retrieving information about the header image...`);
         }
         const requestOptions = {
-            url: `${siteUrl}/_api/web/getfilebyserverrelativeurl('${encodeURIComponent(imageUrl)}')?$select=ListId,UniqueId`,
+            url: `${siteUrl}/_api/web/getfilebyserverrelativeurl('${formatting_1.formatting.encodeQueryParameter(imageUrl)}')?$select=ListId,UniqueId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },