@pnp/cli-microsoft365 6.0.0-beta.c5ce305 → 6.0.0-beta.c63e3b2

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

@@ -16,12 +16,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
+const removeCommand = require('./file-remove');
 class SpoFileCopyCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -108,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',
@@ -123,50 +126,34 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
      * Moves file in the site recycle bin
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const targetFolderAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, targetUrl);
-            // since the target WebFullUrl is unknown we can use getRequestDigestForSite
+            // since the target WebFullUrl is unknown we can use getRequestDigest
             // to get it from target folder absolute url.
             // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            spo_1.spo
-                .getRequestDigest(targetFolderAbsoluteUrl)
-                .then((contextResponse) => {
-                if (this.debug) {
-                    logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
-                }
-                if (targetUrl.charAt(0) !== '/') {
-                    targetUrl = `/${targetUrl}`;
+            const contextResponse = yield spo_1.spo.getRequestDigest(targetFolderAbsoluteUrl);
+            if (this.debug) {
+                logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
+            }
+            const targetFileServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;
+            const removeOptions = {
+                webUrl: contextResponse.WebFullUrl,
+                url: targetFileServerRelativeUrl,
+                recycle: true,
+                confirm: true,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            try {
+                yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
                 }
-                if (targetUrl.lastIndexOf('/') !== targetUrl.length - 1) {
-                    targetUrl = `${targetUrl}/`;
+                else {
+                    throw err;
                 }
-                const requestUrl = `${contextResponse.WebFullUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(`${targetUrl}${filename}`)}')/recycle()`;
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default.post(requestOptions)
-                    .then(() => {
-                    resolve();
-                })
-                    .catch((err) => {
-                    if (err.statusCode === 404) {
-                        // file does not exist so can proceed
-                        return resolve();
-                    }
-                    if (this.debug) {
-                        logger.logToStderr(`recycleFile error...`);
-                        logger.logToStderr(err);
-                    }
-                    reject(err);
-                });
-            }, (e) => reject(e));
+            }
         });
     }
 }

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

@@ -16,12 +16,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
+const removeCommand = require('./file-remove');
 class SpoFileMoveCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -109,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',
@@ -124,49 +127,34 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
      * Moves file in the site recycle bin
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const targetFolderAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, targetUrl);
             // since the target WebFullUrl is unknown we can use getRequestDigest
             // to get it from target folder absolute url.
             // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            spo_1.spo.getRequestDigest(targetFolderAbsoluteUrl)
-                .then((contextResponse) => {
-                if (this.debug) {
-                    logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
-                }
-                if (targetUrl.charAt(0) !== '/') {
-                    targetUrl = `/${targetUrl}`;
+            const contextResponse = yield spo_1.spo.getRequestDigest(targetFolderAbsoluteUrl);
+            if (this.debug) {
+                logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
+            }
+            const targetFileServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;
+            const removeOptions = {
+                webUrl: contextResponse.WebFullUrl,
+                url: targetFileServerRelativeUrl,
+                recycle: true,
+                confirm: true,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            try {
+                yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
                 }
-                if (targetUrl.lastIndexOf('/') !== targetUrl.length - 1) {
-                    targetUrl = `${targetUrl}/`;
+                else {
+                    throw err;
                 }
-                const requestUrl = `${contextResponse.WebFullUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(`${targetUrl}${filename}`)}')/recycle()`;
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default.post(requestOptions)
-                    .then(() => {
-                    resolve();
-                })
-                    .catch((err) => {
-                    if (err.statusCode === 404) {
-                        // file does not exist so can proceed
-                        return resolve();
-                    }
-                    if (this.debug) {
-                        logger.logToStderr(`recycleFile error...`);
-                        logger.logToStderr(err);
-                    }
-                    reject(err);
-                });
-            }, (e) => reject(e));
+            }
         });
     }
 }

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: {
@@ -79,23 +80,26 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteFile(webUrl, sourceUrl, targetFileName) {
-        const targetFileServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativePath(webUrl, sourceUrl.substring(0, sourceUrl.lastIndexOf('/')))}/${targetFileName}`;
-        const options = {
-            webUrl: webUrl,
-            url: targetFileServerRelativeUrl,
-            recycle: true,
-            confirm: true,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(removeCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
-            .then(_ => {
-            return Promise.resolve();
-        }, (err) => {
-            if (err.error !== null && err.error.message !== null && err.error.message.includes('does not exist')) {
-                return Promise.resolve();
+        return __awaiter(this, void 0, void 0, function* () {
+            const targetFileServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativePath(webUrl, sourceUrl.substring(0, sourceUrl.lastIndexOf('/')))}/${targetFileName}`;
+            const removeOptions = {
+                webUrl: webUrl,
+                url: targetFileServerRelativeUrl,
+                recycle: true,
+                confirm: true,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            try {
+                yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
+                }
+                else {
+                    throw err;
+                }
             }
-            return Promise.reject(err);
         });
     }
 }