@pnp/cli-microsoft365 5.4.0-beta.d01ee78 → 5.4.0-beta.d09de0f

package/dist/m365/planner/commands/task/task-get.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -10,6 +11,9 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_GET;
     }
+    alias() {
+        return [commands_1.default.TASK_DETAILS_GET];
+    }
     get description() {
         return 'Retrieve the specified planner task';
     }
@@ -26,27 +30,49 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        this.showDeprecationWarning(logger, commands_1.default.TASK_DETAILS_GET, commands_1.default.TASK_GET);
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
         }
+        // This check has been added to support task details get alias. Needs to be removed when deprecation is removed. 
+        if (args.options.taskId) {
+            args.options.id = args.options.taskId;
+        }
         this
             .getTaskId(args.options)
-            .then(taskId => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
+            .then(taskId => this.getTask(taskId))
+            .then(task => this.getTaskDetails(task))
             .then((res) => {
             logger.log(res);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    getTask(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    getTaskDetails(task) {
+        const requestOptionsTaskDetails = {
+            url: `${this.resource}/v1.0/planner/tasks/${task.id}/details`,
+            headers: {
+                'accept': 'application/json;odata.metadata=none',
+                'Prefer': 'return=representation'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptionsTaskDetails)
+            .then(taskDetails => {
+            return Object.assign(Object.assign({}, task), taskDetails);
+        });
+    }
     getTaskId(options) {
         if (options.id) {
             return Promise.resolve(options.id);
@@ -116,25 +142,9 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
         if (options.ownerGroupId) {
             return Promise.resolve(options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(options.ownerGroupName)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groups = response.value;
-            if (!groups.length) {
-                return Promise.reject(`The specified ownerGroup ${options.ownerGroupName} does not exist`);
-            }
-            if (groups.length > 1) {
-                return Promise.reject(`Multiple ownerGroups with name ${options.ownerGroupName} found: ${groups.map(x => x.id)}`);
-            }
-            return Promise.resolve(groups[0].id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(options.ownerGroupName)
+            .then(group => group.id);
     }
     optionSets() {
         return [
@@ -143,6 +153,7 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     }
     options() {
         const options = [
+            { option: '--taskId [taskId]' },
             { option: '-i, --id [id]' },
             { option: '-t, --title [title]' },
             { option: '--bucketId [bucketId]' },

package/dist/m365/planner/commands/task/task-list.js

@@ -6,6 +6,7 @@ const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerTaskListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_LIST;
@@ -118,22 +119,9 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(encodeURIComponent(args.options.ownerGroupId));
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     mergeTaskPriority(taskItems, betaTaskItems) {
         const findBetaTask = (id) => betaTaskItems.find(task => task.id === id);

package/dist/m365/planner/commands/task/task-remove.js

@@ -0,0 +1,201 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const os = require("os");
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const planner_1 = require("../../../../utils/planner");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.TASK_REMOVE;
+    }
+    get description() {
+        return 'Removes the Microsoft Planner task from a plan';
+    }
+    commandAction(logger, args, cb) {
+        const removeTask = () => {
+            this
+                .getTask(args.options)
+                .then(task => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks/${task.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'if-match': task['@odata.etag']
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.delete(requestOptions);
+            })
+                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            removeTask();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the task ${args.options.id || args.options.title}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeTask();
+                }
+            });
+        }
+    }
+    getTask(options) {
+        const { id, title } = options;
+        if (id) {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${id}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        }
+        return this
+            .getBucketId(options)
+            .then(bucketId => {
+            // $filter is not working on the buckets/{bucketId}/tasks endpoint, hence it is not being used.
+            return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks?$select=title,id`, 'minimal');
+        })
+            .then(tasks => {
+            const filteredtasks = tasks.filter(b => title.toLocaleLowerCase() === b.title.toLocaleLowerCase());
+            if (filteredtasks.length === 0) {
+                return Promise.reject(`The specified task ${title} does not exist`);
+            }
+            if (filteredtasks.length > 1) {
+                return Promise.reject(`Multiple tasks with title ${title} found: Please disambiguate: ${os.EOL}${filteredtasks.map(f => `- ${f.id}`).join(os.EOL)}`);
+            }
+            return Promise.resolve(filteredtasks[0]);
+        });
+    }
+    getBucketId(options) {
+        const { bucketId, bucketName } = options;
+        if (bucketId) {
+            return Promise.resolve(bucketId);
+        }
+        return this
+            .getPlanId(options)
+            .then(planId => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/buckets?$select=id,name`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((buckets) => {
+            const filteredBuckets = buckets.value.filter(b => bucketName.toLocaleLowerCase() === b.name.toLocaleLowerCase());
+            if (filteredBuckets.length === 0) {
+                return Promise.reject(`The specified bucket ${bucketName} does not exist`);
+            }
+            if (filteredBuckets.length > 1) {
+                return Promise.reject(`Multiple buckets with name ${bucketName} found: Please disambiguate:${os.EOL}${filteredBuckets.map(f => `- ${f.id}`).join(os.EOL)}`);
+            }
+            return Promise.resolve(filteredBuckets[0].id);
+        });
+    }
+    getPlanId(options) {
+        const { planId, planTitle } = options;
+        if (planId) {
+            return Promise.resolve(planId);
+        }
+        return this
+            .getGroupId(options)
+            .then(groupId => planner_1.planner.getPlanByName(planTitle, groupId))
+            .then(plan => plan.id);
+    }
+    getGroupId(options) {
+        const { ownerGroupId, ownerGroupName } = options;
+        if (ownerGroupId) {
+            return Promise.resolve(ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            if (response.value.length === 0) {
+                return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
+            }
+            return Promise.resolve(response.value[0].id);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-i, --id [id]' },
+            { option: '-t, --title [title]' },
+            { option: '--bucketId [bucketId]' },
+            { option: '--bucketName [bucketName]' },
+            { option: '--planId [planId]' },
+            { option: '--planTitle [planTitle]' },
+            { option: '--ownerGroupId [ownerGroupId]' },
+            { option: '--ownerGroupName [ownerGroupName]' },
+            { option: '--confirm' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    optionSets() {
+        return [
+            ['id', 'title']
+        ];
+    }
+    validate(args) {
+        if (args.options.id) {
+            if (args.options.bucketId || args.options.bucketName || args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify bucketId,bucketName, planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            }
+        }
+        if (args.options.title) {
+            if (!args.options.bucketId && !args.options.bucketName) {
+                return 'Specify either bucketId or bucketName when using title';
+            }
+            if (args.options.bucketId && args.options.bucketName) {
+                return 'Specify either bucketId or bucketName when using title but not both';
+            }
+            if (args.options.bucketName) {
+                if (!args.options.planId && !args.options.planTitle) {
+                    return 'Specify either planId or planTitle when using bucketName';
+                }
+                if (args.options.planId && args.options.planTitle) {
+                    return 'Specify either planId or planTitle when using bucketName but not both';
+                }
+            }
+            if (args.options.planTitle) {
+                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
+                }
+                if (args.options.ownerGroupId && args.options.ownerGroupName) {
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
+                }
+            }
+            if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+                return `${args.options.ownerGroupId} is not a valid GUID`;
+            }
+        }
+        return true;
+    }
+}
+module.exports = new PlannerTaskRemoveCommand();
+//# sourceMappingURL=task-remove.js.map

package/dist/m365/planner/commands/task/task-set.js

@@ -6,6 +6,7 @@ const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerTaskSetCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
@@ -230,22 +231,9 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         if (options.ownerGroupId) {
             return Promise.resolve(options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(options.ownerGroupName)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(options.ownerGroupName)
+            .then(group => group.id);
     }
     mapRequestBody(options, appliedCategories) {
         const requestBody = {};

package/dist/m365/planner/commands/tenant/tenant-settings-list.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const PlannerCommand_1 = require("../../../base/PlannerCommand");
+const commands_1 = require("../../commands");
+class PlannerTenantSettingsListCommand extends PlannerCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_SETTINGS_LIST;
+    }
+    get description() {
+        return 'Lists the Microsoft Planner configuration of the tenant';
+    }
+    defaultProperties() {
+        return ['isPlannerAllowed', 'allowCalendarSharing', 'allowTenantMoveWithDataLoss', 'allowTenantMoveWithDataMigration', 'allowRosterCreation', 'allowPlannerMobilePushNotifications'];
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((result) => {
+            logger.log(result);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+module.exports = new PlannerTenantSettingsListCommand();
+//# sourceMappingURL=tenant-settings-list.js.map

package/dist/m365/planner/commands.js

@@ -3,20 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'planner';
 exports.default = {
     BUCKET_ADD: `${prefix} bucket add`,
+    BUCKET_GET: `${prefix} bucket get`,
     BUCKET_LIST: `${prefix} bucket list`,
     BUCKET_SET: `${prefix} bucket set`,
     BUCKET_REMOVE: `${prefix} bucket remove`,
-    BUCKET_GET: `${prefix} bucket get`,
     PLAN_ADD: `${prefix} plan add`,
     PLAN_DETAILS_GET: `${prefix} plan details get`,
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     TASK_ADD: `${prefix} task add`,
+    TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,
     TASK_DETAILS_GET: `${prefix} task details get`,
     TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_REFERENCE_ADD: `${prefix} task reference add`,
     TASK_REFERENCE_LIST: `${prefix} task reference list`,
-    TASK_SET: `${prefix} task set`
+    TASK_REMOVE: `${prefix} task remove`,
+    TASK_SET: `${prefix} task set`,
+    TENANT_SETTINGS_LIST: `${prefix} tenant settings list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -116,7 +116,7 @@ class SpoContentTypeAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Retrieving list id...`);
                 }
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitle)}')?$select=Id`,
+                    url: `${webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitle)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -70,7 +70,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand_1.default {
                 }
                 // Request for the ListId
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')?$select=Id`,
+                    url: `${args.options.webUrl}/_api/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$select=Id`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -18,7 +18,7 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
         };
     }
     commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/` : '')}contenttypes`;
+        let requestUrl = `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}contenttypes`;
         if (args.options.id) {
             requestUrl += `('${encodeURIComponent(args.options.id)}')`;
         }

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

@@ -26,14 +26,14 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
         let listUrl = '';
         let filter = '?$filter=';
         if (args.options.listId) {
-            listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
         }
         else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+            listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
         }
         else if (args.options.listUrl) {
             const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
         }
         if (!args.options.scope || args.options.scope === 'web') {
             requestUrl += `web/${listUrl}eventreceivers`;

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

@@ -16,7 +16,7 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
+                url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue,
                     accept: 'application/json;odata=nometadata'

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

@@ -23,21 +23,21 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let listRestUrl = '';
         if (args.options.listId) {
-            listRestUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+            listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
         }
         else if (args.options.listTitle) {
-            listRestUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+            listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
         }
         else if (args.options.listUrl) {
             const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listRestUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+            listRestUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
         }
         let fieldRestUrl = '';
         if (args.options.id) {
-            fieldRestUrl = `/getbyid('${encodeURIComponent(args.options.id)}')`;
+            fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            fieldRestUrl = `/getbyinternalnameortitle('${encodeURIComponent(args.options.fieldTitle)}')`;
+            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.fieldTitle)}')`;
         }
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,

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

@@ -24,14 +24,14 @@ class SpoFieldListCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let listUrl = '';
         if (args.options.listId) {
-            listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
         }
         else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+            listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
         }
         else if (args.options.listUrl) {
             const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
         }
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/${listUrl}fields`,

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

@@ -37,10 +37,10 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
             }
             let fieldRestUrl = '';
             if (fieldId) {
-                fieldRestUrl = `/getbyid('${encodeURIComponent(fieldId)}')`;
+                fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(fieldId)}')`;
             }
             else {
-                fieldRestUrl = `/getbyinternalnameortitle('${encodeURIComponent(fieldTitle)}')`;
+                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(fieldTitle)}')`;
             }
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -57,14 +57,14 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         const prepareRemoval = () => {
             let listRestUrl = '';
             if (args.options.listId) {
-                listRestUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+                listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
             }
             else if (args.options.listTitle) {
-                listRestUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+                listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listRestUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+                listRestUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
             if (args.options.group) {
                 if (this.verbose) {

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -32,7 +32,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving sharing information report for the file with item Id  ${fileInformation.fileItemId}`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/lists/getbytitle('${fileInformation.libraryName}')/items(${fileInformation.fileItemId})/GetSharingInformation?$select=permissionsInformation&$Expand=permissionsInformation`,
+                url: `${args.options.webUrl}/_api/web/lists/getbytitle('${utils_1.formatting.encodeQueryParameter(fileInformation.libraryName)}')/items(${fileInformation.fileItemId})/GetSharingInformation?$select=permissionsInformation&$Expand=permissionsInformation`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -24,15 +24,15 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
+            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
             logger.logToStderr(`Adding content type ${args.options.contentTypeId} to list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/ContentTypes/AddAvailableContentType`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes/AddAvailableContentType`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/ContentTypes/AddAvailableContentType`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes/AddAvailableContentType`;
         }
         const requestBody = this.mapRequestBody(args.options);
         const requestOptions = {

package/dist/m365/spo/commands/list/list-contenttype-default-set.js

@@ -24,8 +24,8 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const baseUrl = args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')` :
-            `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` :
+            `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         if (this.verbose) {
             logger.logToStderr('Retrieving content type order...');
         }

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

@@ -22,15 +22,15 @@ class SpoListContentTypeListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
+            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
             logger.logToStderr(`Retrieving content types information for list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/ContentTypes`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/ContentTypes`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes`;
         }
         const requestOptions = {
             url: requestUrl,