@pnp/cli-microsoft365 5.9.0-beta.fd6d022 → 6.0.0-beta.01ba480

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

@@ -0,0 +1,180 @@
+"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 _SpoFileRoleAssignmentRemoveCommand_instances, _SpoFileRoleAssignmentRemoveCommand_initTelemetry, _SpoFileRoleAssignmentRemoveCommand_initOptions, _SpoFileRoleAssignmentRemoveCommand_initValidators, _SpoFileRoleAssignmentRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoFileGetCommand = require("./file-get");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileRoleAssignmentRemoveCommand_instances, "m", _SpoFileRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleAssignmentRemoveCommand_instances, "m", _SpoFileRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleAssignmentRemoveCommand_instances, "m", _SpoFileRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleAssignmentRemoveCommand_instances, "m", _SpoFileRoleAssignmentRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from a file.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const fileURL = yield this.getFileURL(args);
+                    let principalId;
+                    if (args.options.groupName) {
+                        principalId = yield this.getGroupPrincipalId(args.options);
+                    }
+                    else if (args.options.upn) {
+                        principalId = yield this.getUserPrincipalId(args.options);
+                    }
+                    else {
+                        principalId = args.options.principalId;
+                    }
+                    const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeRoleAssignment();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove role assignment from file ${args.options.fileUrl || args.options.fileId} from site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
+    }
+    getFileURL(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.fileUrl) {
+                return args.options.fileUrl;
+            }
+            const options = {
+                webUrl: args.options.webUrl,
+                id: args.options.fileId,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoFileGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getFileOutput = JSON.parse(output.stdout);
+            return getFileOutput.ServerRelativeUrl;
+        });
+    }
+    getUserPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userGetCommandOptions = {
+                webUrl: options.webUrl,
+                email: options.upn,
+                id: undefined,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
+            const getUserOutput = JSON.parse(output.stdout);
+            return getUserOutput.Id;
+        });
+    }
+    getGroupPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupGetCommandOptions = {
+                webUrl: options.webUrl,
+                name: options.groupName,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
+            const getGroupOutput = JSON.parse(output.stdout);
+            return getGroupOutput.Id;
+        });
+    }
+}
+_SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssignmentRemoveCommand_initTelemetry = function _SpoFileRoleAssignmentRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileRoleAssignmentRemoveCommand_initOptions = function _SpoFileRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileRoleAssignmentRemoveCommand_initValidators = function _SpoFileRoleAssignmentRemoveCommand_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.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileRoleAssignmentRemoveCommand_initOptionSets = function _SpoFileRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push(['fileUrl', 'fileId'], ['upn', 'groupName', 'principalId']);
+};
+module.exports = new SpoFileRoleAssignmentRemoveCommand();
+//# sourceMappingURL=file-roleassignment-remove.js.map

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

@@ -0,0 +1,129 @@
+"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 _SpoFileRoleInheritanceBreakCommand_instances, _SpoFileRoleInheritanceBreakCommand_initTelemetry, _SpoFileRoleInheritanceBreakCommand_initOptions, _SpoFileRoleInheritanceBreakCommand_initValidators, _SpoFileRoleInheritanceBreakCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const formatting_1 = require("../../../../utils/formatting");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoFileGetCommand = require("./file-get");
+class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileRoleInheritanceBreakCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceBreakCommand_instances, "m", _SpoFileRoleInheritanceBreakCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceBreakCommand_instances, "m", _SpoFileRoleInheritanceBreakCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceBreakCommand_instances, "m", _SpoFileRoleInheritanceBreakCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceBreakCommand_instances, "m", _SpoFileRoleInheritanceBreakCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_ROLEINHERITANCE_BREAK;
+    }
+    get description() {
+        return 'Breaks inheritance of a file. Keeping existing permissions is the default behavior.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const breakFileRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const fileURL = yield this.getFileURL(args);
+                    const keepExistingPermissions = !args.options.clearExistingPermissions;
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakFileRoleInheritance();
+            }
+            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 file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield breakFileRoleInheritance();
+                }
+            }
+        });
+    }
+    getFileURL(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.fileUrl) {
+                return args.options.fileUrl;
+            }
+            const options = {
+                webUrl: args.options.webUrl,
+                id: args.options.fileId,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoFileGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getFileOutput = JSON.parse(output.stdout);
+            return getFileOutput.ServerRelativeUrl;
+        });
+    }
+}
+_SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInheritanceBreakCommand_initTelemetry = function _SpoFileRoleInheritanceBreakCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            clearExistingPermissions: !!args.options.clearExistingPermissions,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileRoleInheritanceBreakCommand_initOptions = function _SpoFileRoleInheritanceBreakCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: 'i, --fileId [fileId]'
+    }, {
+        option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileRoleInheritanceBreakCommand_initValidators = function _SpoFileRoleInheritanceBreakCommand_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.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileRoleInheritanceBreakCommand_initOptionSets = function _SpoFileRoleInheritanceBreakCommand_initOptionSets() {
+    this.optionSets.push(['fileId', 'fileUrl']);
+};
+module.exports = new SpoFileRoleInheritanceBreakCommand();
+//# sourceMappingURL=file-roleinheritance-break.js.map

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -45,7 +45,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
                     const requestOptions = {
                         url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                         headers: {
-                            accept: 'application/json;odata.metadata=none'
+                            accept: 'application/json;odata=nometadata'
                         },
                         responseType: 'json'
                     };

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

@@ -37,7 +37,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
         return 'Generates a sharing information report for the specified file';
     }
     getExcludedOptionsWithUrls() {
-        return ['url'];
+        return ['fileUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -93,11 +93,11 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
     }
     getNeededFileInformation(args) {
         let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.id)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+        if (args.options.fileId) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.url)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${encodeURIComponent(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -116,17 +116,17 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
 _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetCommand_initTelemetry = function _SpoFileSharinginfoGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString()
+            fileId: (!(!args.options.fileId)).toString(),
+            fileUrl: (!(!args.options.fileUrl)).toString()
         });
     });
 }, _SpoFileSharinginfoGetCommand_initOptions = function _SpoFileSharinginfoGetCommand_initOptions() {
     this.options.unshift({
-        option: '-w, --webUrl <webUrl>'
+        option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id [id]'
+        option: '-i, --fileId [fileId]'
     }, {
-        option: '-u, --url [url]'
+        option: '-f, --fileUrl [fileUrl]'
     });
 }, _SpoFileSharinginfoGetCommand_initValidators = function _SpoFileSharinginfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -134,15 +134,15 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
         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`;
+        if (args.options.fileId) {
+            if (!validation_1.validation.isValidGuid(args.options.fileId)) {
+                return `${args.options.fileId} is not a valid GUID`;
             }
         }
         return true;
     }));
 }, _SpoFileSharinginfoGetCommand_initOptionSets = function _SpoFileSharinginfoGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'url']);
+    this.optionSets.push(['fileId', 'fileUrl']);
 };
 module.exports = new SpoFileSharinginfoGetCommand();
 //# sourceMappingURL=file-sharinginfo-get.js.map

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

@@ -45,8 +45,8 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (args.options.id) {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
             }
-            else if (args.options.folderUrl) {
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            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 = {
@@ -72,15 +72,15 @@ 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'
         });
     });
 }, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl [folderUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
@@ -98,7 +98,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
         return true;
     }));
 }, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
-    this.optionSets.push(['folderUrl', 'id']);
+    this.optionSets.push(['url', 'id']);
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -41,7 +41,7 @@ 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);
+                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()`;
@@ -71,7 +71,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 +91,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>'
     });

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

@@ -0,0 +1,168 @@
+"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 _SpoFolderRoleAssignmentRemoveCommand_instances, _SpoFolderRoleAssignmentRemoveCommand_initTelemetry, _SpoFolderRoleAssignmentRemoveCommand_initOptions, _SpoFolderRoleAssignmentRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFolderRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.FOLDER_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from the specified folder';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing role assignment from folder in site at ${args.options.webUrl}...`);
+                }
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                try {
+                    if (args.options.upn) {
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                    else if (args.options.groupName) {
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                    else {
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeRoleAssignment();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove a role assignment from the folder with url '${args.options.folderUrl}'?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
+    }
+    removeRoleAssignment(requestUrl, logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getGroupPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupGetCommandOptions = {
+                webUrl: options.webUrl,
+                name: options.groupName,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
+            const getGroupOutput = JSON.parse(output.stdout);
+            return getGroupOutput.Id;
+        });
+    }
+    getUserPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userGetCommandOptions = {
+                webUrl: options.webUrl,
+                email: options.upn,
+                id: undefined,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
+            const getUserOutput = JSON.parse(output.stdout);
+            return getUserOutput.Id;
+        });
+    }
+}
+_SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleAssignmentRemoveCommand_initTelemetry = function _SpoFolderRoleAssignmentRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoFolderRoleAssignmentRemoveCommand_initOptions = function _SpoFolderRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --folderUrl <folderUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRoleAssignmentRemoveCommand_initValidators = function _SpoFolderRoleAssignmentRemoveCommand_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.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id, upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id, upn or groupName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoFolderRoleAssignmentRemoveCommand();
+//# sourceMappingURL=folder-roleassignment-remove.js.map