@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -16,10 +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 utils_1 = require("../../../../utils");
+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();
@@ -57,9 +62,9 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-                const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+                const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -67,7 +72,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
-                        destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                        destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                         options: {
                             "AllowSchemaMismatch": allowSchemaMismatch,
                             "IgnoreVersionHistory": true
@@ -81,7 +86,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     const copyJobInfo = jobInfo.value[0];
                     const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -106,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',
@@ -121,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) => {
-            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
-            // since the target WebFullUrl is unknown we can use getRequestDigestForSite
+        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
-            utils_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));
+            }
         });
     }
 }
@@ -188,7 +177,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         option: '--allowSchemaMismatch'
     });
 }, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileGetCommand extends SpoCommand_1.default {
@@ -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,
@@ -140,12 +141,12 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
     });
 }, _SpoFileGetCommand_initValidators = function _SpoFileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileListCommand extends SpoCommand_1.default {
@@ -51,7 +52,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
     getFiles(folderUrl, args, files = { value: [] }) {
         // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
         const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${utils_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
+        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
         if (args.options.output !== 'json') {
             requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
         }
@@ -94,7 +95,7 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
         option: '-r, --recursive'
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map

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

@@ -16,10 +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 utils_1 = require("../../../../utils");
+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();
@@ -57,9 +62,9 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-                const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+                const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -67,7 +72,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
-                        destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                        destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                         options: {
                             "AllowSchemaMismatch": allowSchemaMismatch,
                             "IgnoreVersionHistory": true,
@@ -82,7 +87,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -107,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',
@@ -122,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) => {
-            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
+        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
-            utils_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));
+            }
         });
     }
 }
@@ -188,7 +178,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         option: '--allowSchemaMismatch'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFileRemoveCommand_initOptions, _SpoFileRemoveCommand_initValidators, _SpoFileRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileRemoveCommand extends SpoCommand_1.default {
@@ -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()`;
@@ -86,7 +87,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                 yield removeFile();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -122,12 +123,12 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     });
 }, _SpoFileRemoveCommand_initValidators = function _SpoFileRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileRenameCommand_instances, _SpoFileRenameCommand_initTelemetry, _SpoFileRenameCommand_initOptions, _SpoFileRenameCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const removeCommand = require('./file-remove');
@@ -38,7 +40,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
-            const originalFileServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
+            const originalFileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
             try {
                 yield this.getFile(originalFileServerRelativeUrl, webUrl);
                 if (args.options.force) {
@@ -51,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'
                     },
@@ -67,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: {
@@ -78,23 +80,26 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteFile(webUrl, sourceUrl, targetFileName) {
-        const targetFileServerRelativeUrl = `${utils_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);
         });
     }
 }
@@ -115,7 +120,7 @@ _SpoFileRenameCommand_instances = new WeakSet(), _SpoFileRenameCommand_initTelem
         option: '--force'
     });
 }, _SpoFileRenameCommand_initValidators = function _SpoFileRenameCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileRenameCommand();
 //# sourceMappingURL=file-rename.js.map