@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3da776c

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

@@ -13,19 +13,22 @@ 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 _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators;
+var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initTelemetry, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators, _SpoFolderGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FOLDER_GET;
@@ -33,41 +36,69 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specified folder';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
-        }
-        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((folder) => {
-            logger.log(folder);
-            cb();
-        }, (err) => {
-            if (err.statusCode && err.statusCode === 500) {
-                cb(new Command_1.CommandError('Please check the folder URL. Folder might not exist on the specified URL'));
-                return;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
+            }
+            else if (args.options.url) {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const folder = yield request_1.default.get(requestOptions);
+                logger.log(folder);
+            }
+            catch (err) {
+                if (err.statusCode && err.statusCode === 500) {
+                    throw new Command_1.CommandError('Please check the folder URL. Folder might not exist on the specified URL');
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
-            this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
 }
-_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
+_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
+        });
+    });
+}, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '-f, --url [url]'
+    }, {
+        option: '-i, --id [id]'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_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* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
+            }
+        }
+        return true;
+    }));
+}, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
+    this.optionSets.push(['url', 'id']);
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderListCommand_instances, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderListCommand extends SpoCommand_1.default {
@@ -35,25 +36,28 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Name', 'ServerRelativeUrl'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl}...`);
-        }
-        const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
-        const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/folders`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((resp) => {
-            logger.log(resp.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl}...`);
+            }
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/folders`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const resp = yield request_1.default.get(requestOptions);
+                logger.log(resp.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
@@ -63,7 +67,7 @@ _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initOptio
         option: '-p, --parentFolderUrl <parentFolderUrl>'
     });
 }, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_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 SpoFolderListCommand();
 //# sourceMappingURL=folder-list.js.map

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

@@ -17,7 +17,9 @@ var _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 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");
 class SpoFolderMoveCommand extends SpoCommand_1.default {
@@ -37,52 +39,55 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
     getExcludedOptionsWithUrls() {
         return ['targetUrl'];
     }
-    commandAction(logger, args, cb) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        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'
-        };
-        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}`;
+            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'
+            };
+            try {
+                const jobInfo = yield request_1.default.post(requestOptions);
                 this.dots = '';
                 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({
-                        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);
+            }
+        });
     }
 }
 _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
@@ -102,7 +107,7 @@ _SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelem
         option: '--allowSchemaMismatch'
     });
 }, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_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 SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderRemoveCommand_instances, _SpoFolderRemoveCommand_initTelemetry, _SpoFolderRemoveCommand_initOptions, _SpoFolderRemoveCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderRemoveCommand extends SpoCommand_1.default {
@@ -34,48 +35,49 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Deletes the specified folder';
     }
-    commandAction(logger, args, cb) {
-        const removeFolder = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
-            }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
-            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(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeFolder();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeFolder = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
+                }
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+                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);
                 }
-                else {
-                    removeFolder();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeFolder();
+            }
+            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 folder ${args.options.url} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeFolder();
+                }
+            }
+        });
     }
 }
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
@@ -96,7 +98,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
         option: '--confirm'
     });
 }, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_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 SpoFolderRemoveCommand();
 //# sourceMappingURL=folder-remove.js.map

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

@@ -17,7 +17,9 @@ var _SpoFolderRenameCommand_instances, _SpoFolderRenameCommand_initOptions, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 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");
 class SpoFolderRenameCommand extends SpoCommand_1.default {
@@ -33,43 +35,37 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
     get description() {
         return 'Renames a folder';
     }
-    commandAction(logger, args, cb) {
-        let formDigestValue = '';
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((webIdentityResp) => {
-            return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.url, formDigestValue);
-        })
-            .then((folderObjectIdentity) => {
-            if (this.verbose) {
-                logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
+    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 serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
+                const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': formDigestValue
+                    },
+                    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>`
+                };
+                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 serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
-            const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': formDigestValue
-                },
-                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>`
-            };
-            return new Promise((resolve, reject) => {
-                request_1.default.post(requestOptions).then((res) => {
-                    const json = JSON.parse(res);
-                    const contents = json.find(x => { return x['ErrorInfo']; });
-                    if (contents && contents.ErrorInfo) {
-                        return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                    }
-                    return resolve();
-                }, (err) => { reject(err); });
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initOptions = function _SpoFolderRenameCommand_initOptions() {
@@ -81,7 +77,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
         option: '-n, --name <name>'
     });
 }, _SpoFolderRenameCommand_initValidators = function _SpoFolderRenameCommand_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 SpoFolderRenameCommand();
 //# sourceMappingURL=folder-rename.js.map

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

@@ -0,0 +1,94 @@
+"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 _SpoFolderRoleInheritanceBreakCommand_instances, _SpoFolderRoleInheritanceBreakCommand_initTelemetry, _SpoFolderRoleInheritanceBreakCommand_initOptions, _SpoFolderRoleInheritanceBreakCommand_initValidators;
+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");
+class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFolderRoleInheritanceBreakCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleInheritanceBreakCommand_instances, "m", _SpoFolderRoleInheritanceBreakCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.FOLDER_ROLEINHERITANCE_BREAK;
+    }
+    get description() {
+        return 'Breaks the role inheritance of a folder. Keeping existing permissions is the default behavior.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const keepExistingPermissions = !args.options.clearExistingPermissions;
+            const breakFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folderUrl)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakFolderRoleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield breakFolderRoleInheritance();
+                }
+            }
+        });
+    }
+}
+_SpoFolderRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFolderRoleInheritanceBreakCommand_initTelemetry = function _SpoFolderRoleInheritanceBreakCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            clearExistingPermissions: !!args.options.clearExistingPermissions,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFolderRoleInheritanceBreakCommand_initOptions = function _SpoFolderRoleInheritanceBreakCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --folderUrl <folderUrl>'
+    }, {
+        option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRoleInheritanceBreakCommand_initValidators = function _SpoFolderRoleInheritanceBreakCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+};
+module.exports = new SpoFolderRoleInheritanceBreakCommand();
+//# sourceMappingURL=folder-roleinheritance-break.js.map