@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -0,0 +1,119 @@
+"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 _SpoFileVersionRemoveCommand_instances, _SpoFileVersionRemoveCommand_initTelemetry, _SpoFileVersionRemoveCommand_initOptions, _SpoFileVersionRemoveCommand_initValidators, _SpoFileVersionRemoveCommand_initOptionSets, _SpoFileVersionRemoveCommand_initTypes;
+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 SpoFileVersionRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileVersionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRemoveCommand_instances, "m", _SpoFileVersionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRemoveCommand_instances, "m", _SpoFileVersionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRemoveCommand_instances, "m", _SpoFileVersionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRemoveCommand_instances, "m", _SpoFileVersionRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRemoveCommand_instances, "m", _SpoFileVersionRemoveCommand_initTypes).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_VERSION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific version of a file in a SharePoint Document library';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removes version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
+            }
+            try {
+                if (args.options.confirm) {
+                    yield this.removeVersion(args);
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to remove the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?`
+                    });
+                    if (result.continue) {
+                        yield this.removeVersion(args);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeVersion(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/DeleteByLabel('${args.options.label}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.delete(requestOptions);
+        });
+    }
+}
+_SpoFileVersionRemoveCommand_instances = new WeakSet(), _SpoFileVersionRemoveCommand_initTelemetry = function _SpoFileVersionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: args.options.fileUrl,
+            fileId: args.options.fileId,
+            confirm: (!!args.options.confirm).toString()
+        });
+    });
+}, _SpoFileVersionRemoveCommand_initOptions = function _SpoFileVersionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-w, --webUrl <webUrl>'
+    }, {
+        option: '--label <label>'
+    }, {
+        option: '-u, --fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileVersionRemoveCommand_initValidators = function _SpoFileVersionRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoFileVersionRemoveCommand_initOptionSets = function _SpoFileVersionRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+}, _SpoFileVersionRemoveCommand_initTypes = function _SpoFileVersionRemoveCommand_initTypes() {
+    this.types.string.push('label');
+};
+module.exports = new SpoFileVersionRemoveCommand();
+//# sourceMappingURL=file-version-remove.js.map

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

@@ -0,0 +1,119 @@
+"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 _SpoFileVersionRestoreCommand_instances, _SpoFileVersionRestoreCommand_initTelemetry, _SpoFileVersionRestoreCommand_initOptions, _SpoFileVersionRestoreCommand_initValidators, _SpoFileVersionRestoreCommand_initOptionSets, _SpoFileVersionRestoreCommand_initTypes;
+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 SpoFileVersionRestoreCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileVersionRestoreCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFileVersionRestoreCommand_instances, "m", _SpoFileVersionRestoreCommand_initTypes).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_VERSION_RESTORE;
+    }
+    get description() {
+        return 'Restores a specific version of a file in a SharePoint Document library';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restores version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
+            }
+            try {
+                if (args.options.confirm) {
+                    yield this.restoreVersion(args);
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to restore the version ${args.options.label} from file ${args.options.fileId || args.options.fileUrl}'?`
+                    });
+                    if (result.continue) {
+                        yield this.restoreVersion(args);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    restoreVersion(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/RestoreByLabel('${args.options.label}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+}
+_SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreCommand_initTelemetry = function _SpoFileVersionRestoreCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: args.options.fileUrl,
+            fileId: args.options.fileId,
+            confirm: (!!args.options.confirm).toString()
+        });
+    });
+}, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
+    this.options.unshift({
+        option: '-w, --webUrl <webUrl>'
+    }, {
+        option: '--label <label>'
+    }, {
+        option: '-u, --fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileVersionRestoreCommand_initValidators = function _SpoFileVersionRestoreCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoFileVersionRestoreCommand_initOptionSets = function _SpoFileVersionRestoreCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+}, _SpoFileVersionRestoreCommand_initTypes = function _SpoFileVersionRestoreCommand_initTypes() {
+    this.types.string.push('label');
+};
+module.exports = new SpoFileVersionRestoreCommand();
+//# sourceMappingURL=file-version-restore.js.map

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

@@ -17,10 +17,14 @@ var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initTelemetry, _SpoFold
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 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");
 const commands_1 = require("../../commands");
+const ListPrincipalType_1 = require("../list/ListPrincipalType");
+const base_permissions_1 = require("../../base-permissions");
+const RoleType_1 = require("../../commands/roledefinition/RoleType");
 class SpoFolderGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -41,13 +45,16 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl += `/GetFolderById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            else if (args.options.folderUrl) {
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            else if (args.options.url) {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            }
+            if (args.options.withPermissions) {
+                requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -58,6 +65,22 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             };
             try {
                 const folder = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    const listItemAllFields = folder.ListItemAllFields;
+                    if (!(listItemAllFields !== null && listItemAllFields !== void 0 ? listItemAllFields : false)) {
+                        throw Error('Please ensure the specified folder URL or folder Id does not refer to a root folder. Use \'spo list get\' with withPermissions instead.');
+                    }
+                    listItemAllFields.RoleAssignments.forEach(r => {
+                        r.Member.PrincipalTypeString = ListPrincipalType_1.ListPrincipalType[r.Member.PrincipalType];
+                        r.RoleDefinitionBindings.forEach(rb => {
+                            const permissions = new base_permissions_1.BasePermissions();
+                            permissions.high = rb.BasePermissions.High;
+                            permissions.low = rb.BasePermissions.Low;
+                            rb.BasePermissionsValue = permissions.parse();
+                            rb.RoleTypeKindValue = RoleType_1.RoleType[rb.RoleTypeKind];
+                        });
+                    });
+                }
                 logger.log(folder);
             }
             catch (err) {
@@ -72,17 +95,20 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
 _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            folderUrl: (!(!args.options.folderUrl)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            withPermissions: typeof args.options.withPermissions !== 'undefined'
         });
     });
 }, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl [folderUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -98,7 +124,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
         return true;
     }));
 }, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
-    this.optionSets.push(['folderUrl', 'id']);
+    this.optionSets.push({ options: ['url', 'id'] });
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -13,9 +13,10 @@ 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 _SpoFolderListCommand_instances, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
+var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -24,6 +25,7 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initValidators).call(this);
     }
@@ -39,32 +41,46 @@ class SpoFolderListCommand extends SpoCommand_1.default {
     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}...`);
+                logger.logToStderr(`Retrieving folders from site ${args.options.webUrl} parent folder ${args.options.parentFolderUrl} ${args.options.recursive ? '(recursive)' : ''}...`);
             }
-            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);
+                const resp = yield this.getFolderList(args.options.webUrl, args.options.parentFolderUrl, args.options.recursive);
+                logger.log(resp);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    getFolderList(webUrl, parentFolderUrl, recursive, folders = []) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, parentFolderUrl);
+            const resp = yield odata_1.odata.getAllItems(`${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`);
+            if (resp.length > 0) {
+                for (const folder of resp) {
+                    folders.push(folder);
+                    if (recursive) {
+                        yield this.getFolderList(webUrl, folder.ServerRelativeUrl, recursive, folders);
+                    }
+                }
+            }
+            return folders;
+        });
+    }
 }
-_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
+_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelemetry = function _SpoFolderListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            recursive: !!args.options.recursive
+        });
+    });
+}, _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
+    }, {
+        option: '--recursive [recursive]'
     });
 }, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -17,6 +17,7 @@ var _SpoFolderRemoveCommand_instances, _SpoFolderRemoveCommand_initTelemetry, _S
 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");
@@ -41,8 +42,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
                 }
@@ -71,7 +72,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.folderUrl} located in site ${args.options.webUrl}?`
+                    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();
@@ -91,7 +92,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '--recycle'
     }, {

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

@@ -41,11 +41,11 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
                 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.folderUrl, 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.folderUrl} to ${args.options.name}`);
+                    logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                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 = {
@@ -72,7 +72,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --url <url>'
     }, {
         option: '-n, --name <name>'
     });