@pnp/cli-microsoft365 6.0.0-beta.f94d570 → 6.0.0-beta.fcd2cc9

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

@@ -1,91 +1,109 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _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 removeCommand = require('./file-remove');
 class SpoFileMoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileMoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FILE_MOVE;
     }
     get description() {
         return 'Moves a file to another location';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.deleteIfAlreadyExists = args.options.deleteIfAlreadyExists || false;
-        telemetryProps.allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        return telemetryProps;
-    }
     getExcludedOptionsWithUrls() {
         return ['targetUrl'];
     }
-    commandAction(logger, args, cb) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        // Check if the source file exists.
-        // Called on purpose, we explicitly check if user specified file
-        // in the sourceUrl option.
-        // The CreateCopyJobs endpoint accepts file, folder or batch from both.
-        // A user might enter folder instead of file as source url by mistake
-        // then there are edge cases when deleteIfAlreadyExists flag is set
-        // the user can receive misleading error message.
-        this
-            .fileExists(tenantUrl, webUrl, args.options.sourceUrl)
-            .then(() => {
-            if (args.options.deleteIfAlreadyExists) {
-                // try delete target file, if deleteIfAlreadyExists flag is set
-                const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
-                return this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
-            }
-            return Promise.resolve();
-        })
-            .then(() => {
-            // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
-            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                    options: {
-                        "AllowSchemaMismatch": allowSchemaMismatch,
-                        "IgnoreVersionHistory": true,
-                        "IsMoveMode": true
-                    }
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((jobInfo) => {
-            return new Promise((resolve, reject) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const webUrl = args.options.webUrl;
+            const parsedUrl = url.parse(webUrl);
+            const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
+            try {
+                // Check if the source file exists.
+                // Called on purpose, we explicitly check if user specified file
+                // in the sourceUrl option.
+                // The CreateCopyJobs endpoint accepts file, folder or batch from both.
+                // A user might enter folder instead of file as source url by mistake
+                // then there are edge cases when deleteIfAlreadyExists flag is set
+                // the user can receive misleading error message.
+                this.fileExists(tenantUrl, webUrl, args.options.sourceUrl);
+                if (args.options.deleteIfAlreadyExists) {
+                    // try delete target file, if deleteIfAlreadyExists flag is set
+                    const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
+                    yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
+                }
+                // all preconditions met, now create copy job
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
+                const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        exportObjectUris: [sourceAbsoluteUrl],
+                        destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                        options: {
+                            "AllowSchemaMismatch": allowSchemaMismatch,
+                            "IgnoreVersionHistory": true,
+                            "IsMoveMode": true
+                        }
+                    },
+                    responseType: 'json'
+                };
+                const jobInfo = yield request_1.default.post(requestOptions);
                 this.dots = '';
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-                setTimeout(() => {
-                    utils_1.spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        dots: this.dots,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                yield new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        spo_1.spo.waitUntilCopyJobFinished({
+                            copyJobInfo,
+                            siteUrl: webUrl,
+                            pollingInterval: progressPollInterval,
+                            resolve,
+                            reject,
+                            logger,
+                            dots: this.dots,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
+                    }, progressPollInterval);
+                });
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     /**
      * Checks if a file exists on the server relative url
@@ -108,75 +126,58 @@ 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));
-        });
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-s, --sourceUrl <sourceUrl>'
-            },
-            {
-                option: '-t, --targetUrl <targetUrl>'
-            },
-            {
-                option: '--deleteIfAlreadyExists'
-            },
-            {
-                option: '--allowSchemaMismatch'
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        });
     }
 }
+_SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            deleteIfAlreadyExists: args.options.deleteIfAlreadyExists || false,
+            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+        });
+    });
+}, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --sourceUrl <sourceUrl>'
+    }, {
+        option: '-t, --targetUrl <targetUrl>'
+    }, {
+        option: '--deleteIfAlreadyExists'
+    }, {
+        option: '--allowSchemaMismatch'
+    });
+}, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
+    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

@@ -1,128 +1,139 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.FILE_REMOVE;
     }
     get description() {
         return 'Removes the specified file';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.url = (!(!args.options.url)).toString();
-        telemetryProps.recycle = (!(!args.options.recycle)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     getExcludedOptionsWithUrls() {
         return ['url'];
     }
-    commandAction(logger, args, cb) {
-        const removeFile = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing file in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${encodeURIComponent(args.options.id)}')`;
-            }
-            else {
-                // concatenate trailing '/' if not provided
-                // so if the provided url is for the root site, the substr bellow will get the right value
-                let serverRelativeSiteUrl = args.options.webUrl;
-                if (!serverRelativeSiteUrl.endsWith('/')) {
-                    serverRelativeSiteUrl = `${serverRelativeSiteUrl}/`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeFile = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing file in site at ${args.options.webUrl}...`);
                 }
-                serverRelativeSiteUrl = serverRelativeSiteUrl.substr(serverRelativeSiteUrl.indexOf('/', 8));
-                let fileUrl = args.options.url;
-                if (!fileUrl.startsWith(serverRelativeSiteUrl)) {
-                    fileUrl = `${serverRelativeSiteUrl}${fileUrl}`;
-                }
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileUrl)}')`;
-            }
-            if (args.options.recycle) {
-                requestUrl += `/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(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeFile();
-        }
-        else {
-            cli_1.Cli.prompt({
-                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}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                let requestUrl = '';
+                if (args.options.id) {
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${encodeURIComponent(args.options.id)}')`;
                 }
                 else {
-                    removeFile();
+                    // concatenate trailing '/' if not provided
+                    // so if the provided url is for the root site, the substr bellow will get the right value
+                    let serverRelativeSiteUrl = args.options.webUrl;
+                    if (!serverRelativeSiteUrl.endsWith('/')) {
+                        serverRelativeSiteUrl = `${serverRelativeSiteUrl}/`;
+                    }
+                    serverRelativeSiteUrl = serverRelativeSiteUrl.substr(serverRelativeSiteUrl.indexOf('/', 8));
+                    let fileUrl = args.options.url;
+                    if (!fileUrl.startsWith(serverRelativeSiteUrl)) {
+                        fileUrl = `${serverRelativeSiteUrl}${fileUrl}`;
+                    }
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(fileUrl)}')`;
+                }
+                if (args.options.recycle) {
+                    requestUrl += `/recycle()`;
+                }
+                const requestOptions = {
+                    url: requestUrl,
+                    method: 'POST',
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-w, --webUrl <webUrl>'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-u, --url [url]'
-            },
-            {
-                option: '--recycle'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeFile();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    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}?`
+                });
+                if (result.continue) {
+                    yield removeFile();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_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()
+        });
+    });
+}, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-w, --webUrl <webUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-u, --url [url]'
+    }, {
+        option: '--recycle'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileRemoveCommand_initValidators = function _SpoFileRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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`;
         }
-        if (args.options.id && args.options.url) {
-            return 'Specify id or url, but not both';
-        }
-        if (!args.options.id && !args.options.url) {
-            return 'Specify id or url';
-        }
         return true;
-    }
-}
+    }));
+}, _SpoFileRemoveCommand_initOptionSets = function _SpoFileRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'url']);
+};
 module.exports = new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map