@pnp/cli-microsoft365 6.0.0-beta.3a40034 → 6.0.0-beta.3bf0c3c

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(['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,6 +17,7 @@ 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");
@@ -43,11 +44,11 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${formatting_1.formatting.encodeQueryParameter(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)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             const requestOptions = {
                 url: requestUrl,

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 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,53 @@ 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`;
+            try {
+                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 requestOptions = {
-                url: requestUrl,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/folders`,
                 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);
+            const resp = yield request_1.default.get(requestOptions);
+            if (resp.value.length > 0) {
+                for (const folder of resp.value) {
+                    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");
@@ -42,7 +43,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     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)}')`;
+                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
                 }

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

@@ -0,0 +1,215 @@
+"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 _SpoFolderRoleAssignmentAddCommand_instances, _SpoFolderRoleAssignmentAddCommand_initTelemetry, _SpoFolderRoleAssignmentAddCommand_initOptions, _SpoFolderRoleAssignmentAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const formatting_1 = require("../../../../utils/formatting");
+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");
+const SpoRoleDefinitionFolderCommand = require("../roledefinition/roledefinition-list");
+class SpoFolderRoleAssignmentAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFolderRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentAddCommand_instances, "m", _SpoFolderRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentAddCommand_instances, "m", _SpoFolderRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentAddCommand_instances, "m", _SpoFolderRoleAssignmentAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.FOLDER_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Adds a role assignment to the specified folder.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role assignment to folder in site at ${args.options.webUrl}...`);
+            }
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            try {
+                //await this.getFolderUrl(args.options);
+                let requestUrl = `${args.options.webUrl}/_api/web/`;
+                if (roleFolderUrl.split('/').length === 2) {
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                }
+                else {
+                    requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                }
+                const roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                if (args.options.upn) {
+                    const upnPrincipalId = yield this.getUserPrincipalId(args.options);
+                    yield this.breakRoleAssignment(requestUrl);
+                    yield this.addRoleAssignment(requestUrl, upnPrincipalId, roleDefinitionId);
+                }
+                else if (args.options.groupName) {
+                    const groupPrincipalId = yield this.getGroupPrincipalId(args.options);
+                    yield this.breakRoleAssignment(requestUrl);
+                    yield this.addRoleAssignment(requestUrl, groupPrincipalId, roleDefinitionId);
+                }
+                else {
+                    yield this.breakRoleAssignment(requestUrl);
+                    yield this.addRoleAssignment(requestUrl, args.options.principalId, roleDefinitionId);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    breakRoleAssignment(requestUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}/breakroleinheritance(true)`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getRoleDefinitionId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.roleDefinitionName) {
+                return Promise.resolve(options.roleDefinitionId);
+            }
+            const roleDefinitionFolderCommandOptions = {
+                webUrl: options.webUrl,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionFolderCommand, { options: Object.assign(Object.assign({}, roleDefinitionFolderCommandOptions), { _: [] }) });
+            const getRoleDefinitionFolderOutput = JSON.parse(output.stdout);
+            const roleDefinition = getRoleDefinitionFolderOutput.find((role) => role.Name === options.roleDefinitionName);
+            if (roleDefinition) {
+                return roleDefinition.Id;
+            }
+            else {
+                throw Error(`The specified role definition name '${options.roleDefinitionName}' does not exist.`);
+            }
+        });
+    }
+    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;
+        });
+    }
+}
+_SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssignmentAddCommand_initTelemetry = function _SpoFolderRoleAssignmentAddCommand_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',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
+        });
+    });
+}, _SpoFolderRoleAssignmentAddCommand_initOptions = function _SpoFolderRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --folderUrl <folderUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    });
+}, _SpoFolderRoleAssignmentAddCommand_initValidators = function _SpoFolderRoleAssignmentAddCommand_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.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (!principalOptions.some(item => item !== undefined)) {
+            return `Specify either principalId, upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId, upn or groupName but not multiple`;
+        }
+        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
+        if (!roleDefinitionOptions.some(item => item !== undefined)) {
+            return `Specify either roleDefinitionId id or roleDefinitionName`;
+        }
+        if (roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either roleDefinitionId id or roleDefinitionName but not both`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoFolderRoleAssignmentAddCommand();
+//# sourceMappingURL=folder-roleassignment-add.js.map

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

@@ -23,6 +23,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
 const SpoGroupGetCommand = require("../group/group-get");
+const formatting_1 = require("../../../../utils/formatting");
 class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -44,7 +45,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     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`;
+                const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                 try {
                     if (args.options.upn) {
                         args.options.principalId = yield this.getUserPrincipalId(args.options);

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

@@ -20,6 +20,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     constructor() {
@@ -38,10 +39,19 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const keepExistingPermissions = !args.options.clearExistingPermissions;
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const breakFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folderUrl)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
                         headers: {
                             accept: 'application/json'
                         },

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

@@ -16,9 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderRoleInheritanceResetCommand_instances, _SpoFolderRoleInheritanceResetCommand_initTelemetry, _SpoFolderRoleInheritanceResetCommand_initOptions, _SpoFolderRoleInheritanceResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
+const formatting_1 = require("../../../../utils/formatting");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     constructor() {
@@ -36,10 +38,19 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const resetFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${args.options.folderUrl}')/ListItemAllFields/resetroleinheritance`,
+                        url: `${requestUrl}/resetroleinheritance`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoGroupGetCommand_instances, _SpoGroupGetCommand_initTelemetry, _SpoGroupGetCommand_initOptions, _SpoGroupGetCommand_initValidators, _SpoGroupGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -41,10 +42,10 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetById('${args.options.id}')`;
             }
             else if (args.options.name) {
-                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.name)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/sitegroups/GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.name)}')`;
             }
             else if (args.options.associatedGroup) {
                 switch (args.options.associatedGroup.toLowerCase()) {

package/dist/m365/spo/commands/group/group-user-add.js

@@ -17,6 +17,7 @@ var _SpoGroupUserAddCommand_instances, _SpoGroupUserAddCommand_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 validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -74,7 +75,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
     }
     getGroupId(args) {
         const getGroupMethod = args.options.groupName ?
-            `GetByName('${encodeURIComponent(args.options.groupName)}')` :
+            `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,

package/dist/m365/spo/commands/group/group-user-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoGroupUserListCommand_instances, _SpoGroupUserListCommand_initTelemetry, _SpoGroupUserListCommand_initOptions, _SpoGroupUserListCommand_initValidators, _SpoGroupUserListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -43,8 +44,8 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving the list of members from the SharePoint group :  ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
             }
             const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users`;
+                ? `GetById('${args.options.groupId}')`
+                : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {

package/dist/m365/spo/commands/group/group-user-remove.js

@@ -17,6 +17,7 @@ var _SpoGroupUserRemoveCommand_instances, _SpoGroupUserRemoveCommand_initTelemet
 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");
@@ -43,8 +44,8 @@ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
                 }
                 const loginName = `i:0#.f|membership|${args.options.userName}`;
                 const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
-                    ? `GetById('${encodeURIComponent(args.options.groupId)}')`
-                    : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+                    ? `GetById('${args.options.groupId}')`
+                    : `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${formatting_1.formatting.encodeQueryParameter(loginName)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {