@pnp/cli-microsoft365 6.11.0-beta.7edcad2 → 6.11.0-beta.cb74646

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

@@ -66,7 +66,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             try {
                 try {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -100,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('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -128,7 +128,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                             logger.logToStderr('Cancelling upload session due to error...');
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                             headers: {
                                 'accept': 'application/json;odata=nometadata'
                             }
@@ -150,7 +150,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('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                         data: fileBody,
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -192,7 +192,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // approve the existing file with given comment
                     const requestOptions = {
-                        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 || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${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'
                         },
@@ -209,7 +209,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // publish the existing file with given comment
                     const requestOptions = {
-                        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 || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${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'
                         },
@@ -223,7 +223,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('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                     };
                     try {
                         yield request_1.default.post(requestOptions);
@@ -266,14 +266,14 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             // check if file already exists, otherwise it can't be checked out
             const requestOptionsGetFile = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 }
             };
             yield request_1.default.get(requestOptionsGetFile);
             const requestOptionsCheckOut = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -299,7 +299,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     fileBuffer = fileBuffer.slice(0, readCount);
                 }
                 const requestOptions = {
-                    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})`,
+                    url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${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',
@@ -358,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('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -383,7 +383,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             }
             // update the existing file list item fields
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -404,7 +404,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     fileCheckIn(args, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                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)`,
+                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${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

@@ -67,7 +67,7 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
             if (args.options.url) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             const requestOptions = {
                 url: requestUrl,

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

@@ -47,7 +47,7 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             }
             if (args.options.url) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators;
+var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -34,11 +34,13 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl));
+                const sourceServerRelativePath = yield this.getSourcePath(logger, args.options);
+                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
                 let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
                 if (args.options.newName) {
                     destinationPath += args.options.newName;
@@ -66,6 +68,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                         overwrite: args.options.nameConflictBehavior === 'replace',
                         options: {
                             KeepBoth: args.options.nameConflictBehavior === 'rename',
+                            ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated,
                             ShouldBypassSharedLocks: !!args.options.bypassSharedLock
                         }
                     }
@@ -77,6 +80,25 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
             }
         });
     }
+    getSourcePath(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.sourceUrl) {
+                return urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
+            }
+            const requestOptions = {
+                url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const file = yield request_1.default.get(requestOptions);
+            return file.ServerRelativePath.DecodedUrl;
+        });
+    }
     getAbsoluteUrl(webUrl, url) {
         return url.startsWith('https://') ? url : urlUtil_1.urlUtil.getAbsoluteUrl(webUrl, url);
     }
@@ -84,8 +106,11 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: args.options.nameConflictBehavior || false,
+            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
             bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
@@ -93,7 +118,9 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
@@ -101,6 +128,8 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
     }, {
         option: '--bypassSharedLock'
     });
@@ -110,11 +139,16 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        if (args.options.sourceId && !validation_1.validation.isValidGuid(args.options.sourceId)) {
+            return `${args.options.sourceId} is not a valid GUID for sourceId.`;
+        }
         if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
-            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}`;
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
         }
         return true;
     }));
+}, _SpoFileCopyCommand_initOptionSets = function _SpoFileCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 module.exports = new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -75,7 +75,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
             }
             const allFiles = [];
             const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}'`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/Files`;
             const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
             if (fieldProperties.expandProperties.length > 0) {
                 queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -87,7 +87,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const requestOptions = {
-                url: `${requestUrl}&${queryParams.join('&')}`,
+                url: `${requestUrl}?${queryParams.join('&')}`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -111,9 +111,9 @@ class SpoFileListCommand extends SpoCommand_1.default {
             }
             const allFolders = [];
             const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/Folders`;
             const requestOptions = {
-                url: `${requestUrl}&$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
+                url: `${requestUrl}?$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'

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

@@ -69,7 +69,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
@@ -109,7 +109,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
      * Checks if a file exists on the server relative url
      */
     fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -55,7 +55,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                 }
                 else {
                     const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
                 }
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
@@ -85,7 +85,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to ${args.options.recycle ? 'recycle' : 'remove'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeFile();
@@ -97,10 +97,10 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
 _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelemetry = function _SpoFileRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
-            recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            recycle: !!args.options.recycle,
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {

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

@@ -53,7 +53,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                         }]
                 };
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                    url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -70,7 +70,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     }
     getFile(originalFileServerRelativeUrl, webUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+            const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -75,7 +75,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
             }
             else {
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             const requestOptions = {
                 url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

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

@@ -96,7 +96,7 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand_1.default {
             }
             else {
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             requestOptions.url = `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ListItemAllFields/ParentList/Id,ListItemAllFields/Id`;
             const response = yield request_1.default.get(requestOptions);

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

@@ -69,7 +69,7 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand_1.default {
     addRoleAssignment(fileUrl, webUrl, principalId, roleDefinitionId) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
+                url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
                 method: 'POST',
                 headers: {
                     'accept': 'application/json;odata=nometadata',

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

@@ -60,7 +60,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     }
                     const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -48,7 +48,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     const fileURL = yield this.getFileURL(args);
                     const keepExistingPermissions = !args.options.clearExistingPermissions;
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -47,7 +47,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
                 try {
                     const fileURL = yield this.getFileURL(args);
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -68,7 +68,7 @@ class SpoFileVersionClearCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteAll()`;

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

@@ -56,7 +56,7 @@ class SpoFileVersionGetCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
                 const serverRelUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;

package/dist/m365/spo/commands/file/file-version-list.js

@@ -48,7 +48,7 @@ class SpoFileVersionListCommand extends SpoCommand_1.default {
                 let requestUrl = `${args.options.webUrl}/_api/web`;
                 if (args.options.fileUrl) {
                     const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                    requestUrl += `/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    requestUrl += `/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 }
                 else {
                     requestUrl += `/GetFileById('${args.options.fileId}')`;

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

@@ -69,7 +69,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -69,7 +69,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
+                requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_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");
@@ -40,15 +41,12 @@ class SpoFolderAddCommand extends SpoCommand_1.default {
             }
             const parentFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
             const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
-            const requestUrl = `${args.options.webUrl}/_api/web/folders`;
+            const requestUrl = `${args.options.webUrl}/_api/web/folders/addUsingPath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
-                data: {
-                    'ServerRelativeUrl': serverRelativeUrl
-                },
                 responseType: 'json'
             };
             try {

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

@@ -52,7 +52,7 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             }
             else if (args.options.url) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
+                requestUrl += `/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.withPermissions) {
                 requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

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

@@ -66,7 +66,7 @@ class SpoFolderListCommand extends SpoCommand_1.default {
             }
             const allFolders = [];
             const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, parentFolderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/Folders`;
             const queryParams = [`$skip=${skip}`, `$top=${SpoFolderListCommand.pageSize}`];
             if (fieldProperties.expandProperties.length > 0) {
                 queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -78,7 +78,7 @@ class SpoFolderListCommand extends SpoCommand_1.default {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const requestOptions = {
-                url: `${requestUrl}&${queryParams.join('&')}`,
+                url: `${requestUrl}?${queryParams.join('&')}`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'

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

@@ -36,6 +36,9 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.confirm) {
@@ -59,8 +62,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
             }
-            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.url);
-            let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.url);
+            let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
             if (options.recycle) {
                 requestUrl += `/recycle()`;
             }
@@ -86,8 +89,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            recycle: !!args.options.recycle,
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {

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

@@ -15,9 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderRenameCommand_instances, _SpoFolderRenameCommand_initOptions, _SpoFolderRenameCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const spo_1 = require("../../../../utils/spo");
+const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -41,32 +40,29 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                const formDigestValue = contextResponse.FormDigestValue;
-                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-                const folderObjectIdentity = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
                 if (this.verbose) {
                     logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
-                const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${args.options.webUrl}/_api/Web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields`,
                     headers: {
-                        'X-RequestDigest': formDigestValue
+                        accept: 'application/json;odata=nometadata',
+                        'if-match': '*'
                     },
-                    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><Method Name="MoveTo" Id="32" ObjectPathId="26"><Parameters><Parameter Type="String">${renamedServerRelativeUrl}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="26" Name="${folderObjectIdentity.objectIdentity}" /></ObjectPaths></Request>`
+                    data: {
+                        FileLeafRef: args.options.name,
+                        Title: args.options.name
+                    },
+                    responseType: 'json'
                 };
-                const res = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+                const response = yield request_1.default.patch(requestOptions);
+                if (response && response['odata.null'] === true) {
+                    throw 'Folder not found.';
                 }
             }
             catch (err) {
-                this.handleRejectedPromise(err);
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }