@pnp/cli-microsoft365 6.0.0-beta.3a04435 → 6.0.0-beta.3bf0c3c

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

@@ -40,74 +40,57 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const getEventReceiversOutput = yield this.getEventReceivers(args.options);
-                const eventReceivers = JSON.parse(getEventReceiversOutput.stdout);
-                if (!eventReceivers.length) {
-                    throw Error(`Specified event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`} cannot be found`);
+            if (args.options.confirm) {
+                yield this.removeEventReceiver(args.options);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove event receiver with ${args.options.id ? `id ${args.options.id}` : `name ${args.options.name}`}?`
+                });
+                if (result.continue) {
+                    yield this.removeEventReceiver(args.options);
                 }
-                if (eventReceivers.length > 1) {
-                    throw Error(`Multiple eventreceivers with ${args.options.id !== undefined ? `id ${args.options.id} found` : `name ${args.options.name}, ids: ${eventReceivers.map(x => x.ReceiverId)} found`}`);
+            }
+        });
+    }
+    removeEventReceiver(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/${options.scope || 'web'}`;
+                if (options.listId) {
+                    requestUrl += `/lists('${options.listId}')`;
                 }
-                if (args.options.confirm) {
-                    yield this.removeEventReceiver(args.options);
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
                 }
-                else {
-                    const result = yield Cli_1.Cli.prompt({
-                        type: 'confirm',
-                        name: 'continue',
-                        default: false,
-                        message: `Are you sure you want to remove event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`}?`
-                    });
-                    if (result.continue) {
-                        yield this.removeEventReceiver(args.options);
-                    }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
+                const rerId = yield this.getEventReceiverId(options);
+                requestUrl += `/eventreceivers('${rerId}')`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    removeEventReceiver(options) {
+    getEventReceiverId(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
-            if (options.listId) {
-                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/`;
-            }
-            else if (options.listTitle) {
-                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/`;
-            }
-            else if (options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!options.scope || options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
-            }
             if (options.id) {
-                filter += `receiverid eq (guid'${options.id}')`;
-            }
-            else {
-                filter += `receivername eq '${options.name}'`;
+                return options.id;
             }
-            const requestOptions = {
-                url: requestUrl + filter,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            yield request_1.default.delete(requestOptions);
-        });
-    }
-    getEventReceivers(options) {
-        return __awaiter(this, void 0, void 0, function* () {
             const getOptions = {
                 webUrl: options.webUrl,
                 listId: options.listId,
@@ -119,7 +102,15 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            return yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const eventReceivers = JSON.parse(commandOutput.stdout);
+            if (!eventReceivers.length) {
+                throw Error(`Specified event receiver with name '${options.name}' cannot be found`);
+            }
+            if (eventReceivers.length > 1) {
+                throw Error(`Multiple eventreceivers with name '${options.name}' found: ${eventReceivers.map(x => x.ReceiverId)}`);
+            }
+            return eventReceivers[0].ReceiverId;
         });
     }
 }
@@ -129,10 +120,10 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
+            scope: args.options.scope || 'web',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -38,9 +39,20 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
+                    url: `${requestUrl}/fields/CreateFieldAsXml`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -99,6 +111,8 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             options: typeof args.options.options !== 'undefined'
         });
     });
@@ -107,6 +121,10 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-x, --xml <xml>'
     }, {
@@ -118,6 +136,13 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
+        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either list id or title or list url, but not multiple`;
+        }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID`;
+        }
         if (args.options.options) {
             let optionsError = true;
             const options = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];

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

@@ -19,6 +19,7 @@ const config_1 = require("../../../../config");
 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");
@@ -45,23 +46,27 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             try {
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = reqDigest.FormDigestValue;
-                let list = undefined;
-                if (args.options.listId || args.options.listTitle) {
-                    const listQuery = args.options.listId ?
-                        `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
-                        `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
+                let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
+                if (args.options.listId || args.options.listTitle || args.options.listUrl) {
+                    let requestData = '';
+                    if (args.options.listId) {
+                        requestData = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method><Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestData = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method><Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestData = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="3" ParentId="1" Name="Web" /><Method Id="5" ParentId="3" Name="GetList"><Parameters><Parameter Type="String">${listServerRelativeUrl}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                    }
                     const requestOptions = {
                         url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': requestDigest
                         },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${listQuery}<Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+                        data: requestData
                     };
-                    list = yield request_1.default.post(requestOptions);
-                }
-                // by default retrieve the column from the site
-                let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
-                if (list) {
+                    const list = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(list);
                     const response = json[0];
                     if (response.ErrorInfo) {
@@ -113,6 +118,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
+            'listUrl',
             'id',
             'title',
             'updateExistingLists',
@@ -134,6 +140,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
             title: typeof args.options.title !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             updateExistingLists: !!args.options.updateExistingLists
         });
     });
@@ -144,6 +151,8 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -157,8 +166,9 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
+        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
+        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either list id or title or list url, but not multiple`;
         }
         if (args.options.listId &&
             !validation_1.validation.isValidGuid(args.options.listId)) {

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

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const fsUtil_1 = require("../../../../utils/fsUtil");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -65,7 +66,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             try {
                 try {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -99,7 +100,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // initiate chunked upload session
                     const uploadId = (0, uuid_1.v4)();
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${encodeURIComponent(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -129,7 +130,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                             logger.logToStderr('Cancelling upload session due to error...');
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                             headers: {
                                 'accept': 'application/json;odata=nometadata'
                             }
@@ -151,7 +152,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     const fileBody = fs.readFileSync(fullPath);
                     const bodyLength = fileBody.byteLength;
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/Add(url='${encodeURIComponent(fileName)}', overwrite=true)`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                         data: fileBody,
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -193,7 +194,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // approve the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/approve(comment='${encodeURIComponent(args.options.approveComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting_1.formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -210,7 +211,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // publish the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/publish(comment='${encodeURIComponent(args.options.publishComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting_1.formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -224,7 +225,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // in a case the command has done checkout
                     // then have to rollback the checkout
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/UndoCheckOut()`
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                     };
                     try {
                         yield request_1.default.post(requestOptions);
@@ -265,7 +266,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     fileCheckOut(fileName, webUrl, folder) {
         // check if file already exists, otherwise it can't be checked out
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             }
@@ -274,7 +275,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             .then(() => {
             // checkout the existing file
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')/CheckOut()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -299,7 +300,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                 fileBuffer = fileBuffer.slice(0, readCount);
             }
             const requestOptions = {
-                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(info.FolderPath)}')/Files('${encodeURIComponent(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                 data: fileBuffer,
                 headers: {
                     'accept': 'application/json;odata=nometadata',
@@ -357,7 +358,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
         }
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folder)}')/Files('${encodeURIComponent(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -380,7 +381,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         }
         // update the existing file list item fields
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -404,7 +405,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     }
     fileCheckIn(args, fileName) {
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(args.options.folder)}')/Files('${encodeURIComponent(fileName)}')/CheckIn(comment='${encodeURIComponent(args.options.checkInComment || '')}',checkintype=0)`,
+            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/file/file-checkin.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _SpoFileCheckinCommand_initOptions, _SpoFileCheckinCommand_initValidators, _SpoFileCheckinCommand_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");
@@ -54,14 +55,14 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
             let comment = '';
             if (args.options.comment) {
-                comment = encodeURIComponent(args.options.comment);
+                comment = formatting_1.formatting.encodeQueryParameter(args.options.comment);
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             if (args.options.url) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             const requestOptions = {
                 url: requestUrl,

package/dist/m365/spo/commands/file/file-checkout.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_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");
@@ -38,10 +39,10 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkout`;
             }
             if (args.options.url) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkout`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,

package/dist/m365/spo/commands/file/file-copy.js

@@ -23,6 +23,7 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 const removeCommand = require('./file-remove');
 class SpoFileCopyCommand extends SpoCommand_1.default {
     constructor() {
@@ -110,7 +111,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
     fileExists(tenantUrl, webUrl, sourceUrl) {
         const webServerRelativeUrl = webUrl.replace(tenantUrl, '');
         const fileServerRelativeUrl = `${webServerRelativeUrl}${sourceUrl}`;
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileServerRelativeUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 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");
@@ -47,7 +48,7 @@ class SpoFileGetCommand extends SpoCommand_1.default {
             let requestUrl = '';
             let options = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.url) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl=@f)`;
@@ -65,7 +66,7 @@ class SpoFileGetCommand extends SpoCommand_1.default {
                 else {
                     options += '&';
                 }
-                options += `@f='${encodeURIComponent(args.options.url)}'`;
+                options += `@f='${formatting_1.formatting.encodeQueryParameter(args.options.url)}'`;
             }
             const requestOptions = {
                 url: requestUrl + options,

package/dist/m365/spo/commands/file/file-move.js

@@ -23,6 +23,7 @@ const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 const removeCommand = require('./file-remove');
 class SpoFileMoveCommand extends SpoCommand_1.default {
     constructor() {
@@ -111,7 +112,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
     fileExists(tenantUrl, webUrl, sourceUrl) {
         const webServerRelativeUrl = webUrl.replace(tenantUrl, '');
         const fileServerRelativeUrl = `${webServerRelativeUrl}${sourceUrl}`;
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileServerRelativeUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -17,6 +17,7 @@ var _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFi
 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 SpoFileRemoveCommand extends SpoCommand_1.default {
                 }
                 let requestUrl = '';
                 if (args.options.id) {
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${encodeURIComponent(args.options.id)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
                     // concatenate trailing '/' if not provided
@@ -60,7 +61,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     if (!fileUrl.startsWith(serverRelativeSiteUrl)) {
                         fileUrl = `${serverRelativeSiteUrl}${fileUrl}`;
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileUrl)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
                 }
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;

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

@@ -17,6 +17,7 @@ var _SpoFileRenameCommand_instances, _SpoFileRenameCommand_initTelemetry, _SpoFi
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 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");
@@ -52,7 +53,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                         }]
                 };
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(originalFileServerRelativeUrl)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')/ListItemAllFields/ValidateUpdateListItem()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -68,7 +69,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
         });
     }
     getFile(originalFileServerRelativeUrl, webUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
         const requestOptions = {
             url: requestUrl,
             headers: {

package/dist/m365/spo/commands/file/file-roleassignment-add.js

@@ -208,24 +208,10 @@ _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignme
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (!principalOptions.some(item => item !== undefined)) {
-            return `Specify either principalId, upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId, upn or groupName but not multiple`;
-        }
-        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
-        if (!roleDefinitionOptions.some(item => item !== undefined)) {
-            return `Specify either roleDefinitionId or roleDefinitionName`;
-        }
-        if (roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either roleDefinitionId or roleDefinitionName but not multiple`;
-        }
         return true;
     }));
 }, _SpoFileRoleAssignmentAddCommand_initOptionSets = function _SpoFileRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push(['fileId', 'fileUrl']);
+    this.optionSets.push(['fileId', 'fileUrl'], ['principalId', 'upn', 'groupName'], ['roleDefinitionId', 'roleDefinitionName']);
 };
 module.exports = new SpoFileRoleAssignmentAddCommand();
 //# sourceMappingURL=file-roleassignment-add.js.map

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

@@ -97,7 +97,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,