@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/spo/commands/web/web-add.js

@@ -37,7 +37,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
         return 'Create new subsite';
     }
     getExcludedOptionsWithUrls() {
-        return ['webUrl'];
+        return ['url'];
     }
     commandAction(logger, args, cb) {
         let siteInfo = null;
@@ -55,7 +55,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 responseType: 'json',
                 data: {
                     parameters: {
-                        Url: args.options.webUrl,
+                        Url: args.options.url,
                         Title: args.options.title,
                         Description: args.options.description,
                         Language: args.options.locale,
@@ -65,7 +65,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 }
             };
             if (this.verbose) {
-                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.webUrl}...`);
+                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.url}...`);
             }
             return request_1.default.post(requestOptions);
         })
@@ -77,7 +77,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr("Setting inheriting navigation from the parent site...");
             }
-            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.webUrl)}`;
+            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
             const requestOptions = {
                 url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                 headers: {
@@ -157,7 +157,7 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-w, --webTemplate <webTemplate>'
     }, {

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

@@ -34,7 +34,7 @@ class SpoWebGetCommand extends SpoCommand_1.default {
         return 'Retrieve information about the specified site';
     }
     commandAction(logger, args, cb) {
-        let url = `${args.options.webUrl}/_api/web`;
+        let url = `${args.options.url}/_api/web`;
         if (args.options.withGroups) {
             url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
         }
@@ -61,12 +61,12 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
     });
 }, _SpoWebGetCommand_initOptions = function _SpoWebGetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--withGroups'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

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

@@ -37,9 +37,9 @@ class SpoWebListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving all webs in site at ${args.options.webUrl}...`);
+            logger.logToStderr(`Retrieving all webs in site at ${args.options.url}...`);
         }
-        let requestUrl = `${args.options.webUrl}/_api/web/webs`;
+        let requestUrl = `${args.options.url}/_api/web/webs`;
         if (args.options.output !== 'json') {
             requestUrl += '?$select=Title,Id,URL';
         }
@@ -60,10 +60,10 @@ class SpoWebListCommand extends SpoCommand_1.default {
 }
 _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = function _SpoWebListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebListCommand_initValidators = function _SpoWebListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

package/dist/m365/spo/commands/web/web-reindex.js

@@ -38,13 +38,13 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         let requestDigest = '';
         let webIdentityResp;
         utils_1.spo
-            .getRequestDigest(args.options.webUrl)
+            .getRequestDigest(args.options.url)
             .then((res) => {
             requestDigest = res.FormDigestValue;
             if (this.debug) {
                 logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
             }
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+            return utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
         })
             .then((identityResp) => {
             webIdentityResp = identityResp;
@@ -54,20 +54,20 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Checking if the site is a no-script site...`);
             }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then((isNoScriptSite) => {
             if (isNoScriptSite) {
                 if (this.verbose) {
                     logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
                 }
-                return this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp);
+                return this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/allproperties`,
+                url: `${args.options.url}/_api/web/allproperties`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -78,7 +78,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             .then((webProperties) => {
             let searchVersion = webProperties.vti_x005f_searchversion || 0;
             searchVersion++;
-            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then(_ => cb(), (err) => {
             if (this.reindexedLists) {
@@ -138,10 +138,10 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map

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

@@ -37,7 +37,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeWeb = () => {
             const requestOptions = {
-                url: `${encodeURI(args.options.webUrl)}/_api/web`,
+                url: `${encodeURI(args.options.url)}/_api/web`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'
@@ -45,7 +45,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             if (this.verbose) {
-                logger.logToStderr(`Deleting subsite ${args.options.webUrl} ...`);
+                logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
             }
             request_1.default
                 .post(requestOptions)
@@ -59,7 +59,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the subsite ${args.options.webUrl}`
+                message: `Are you sure you want to remove the subsite ${args.options.url}`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -79,12 +79,12 @@ _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemet
     });
 }, _SpoWebRemoveCommand_initOptions = function _SpoWebRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--confirm'
     });
 }, _SpoWebRemoveCommand_initValidators = function _SpoWebRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map

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

@@ -0,0 +1,187 @@
+"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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Adds a role assignment to web';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
+        }
+        this.GetRoleDefinitionId(args.options)
+            .then((roleDefinitionId) => {
+            args.options.roleDefinitionId = roleDefinitionId;
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.AddRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.AddRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
+                this.AddRoleAssignment(logger, args.options, cb);
+            }
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    AddRoleAssignment(logger, options, cb) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
+            method: 'POST',
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    GetRoleDefinitionId(options) {
+        if (!options.roleDefinitionName) {
+            return Promise.resolve(options.roleDefinitionId);
+        }
+        const roleDefinitionListCommandOptions = {
+            webUrl: options.webUrl,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+            return Promise.resolve(roleDefinitionId);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetGroupPrincipalId(options) {
+        const groupGetCommandOptions = {
+            webUrl: options.webUrl,
+            name: options.groupName,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getGroupOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getGroupOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetUserPrincipalId(options) {
+        const userGetCommandOptions = {
+            webUrl: options.webUrl,
+            email: options.upn,
+            id: undefined,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getUserOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getUserOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+}
+_SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_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'
+        });
+    });
+}, _SpoWebRoleAssignmentAddCommand_initOptions = function _SpoWebRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    });
+}, _SpoWebRoleAssignmentAddCommand_initValidators = function _SpoWebRoleAssignmentAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_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) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id or upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id or upn or groupName`;
+        }
+        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
+        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either roleDefinitionId id or roleDefinitionName`;
+        }
+        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least roleDefinitionId id or roleDefinitionName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleAssignmentAddCommand();
+//# sourceMappingURL=web-roleassignment-add.js.map

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

@@ -0,0 +1,170 @@
+"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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from web permissions';
+    }
+    commandAction(logger, args, cb) {
+        const removeRoleAssignment = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
+            }
+            if (args.options.upn) {
+                this.GetUserPrincipalId(args.options)
+                    .then((userPrincipalId) => {
+                    args.options.principalId = userPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else if (args.options.groupName) {
+                this.GetGroupPrincipalId(args.options)
+                    .then((groupPrincipalId) => {
+                    args.options.principalId = groupPrincipalId;
+                    this.RemoveRoleAssignment(logger, args.options, cb);
+                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            }
+            else {
+                this.RemoveRoleAssignment(logger, args.options, cb);
+            }
+        };
+        if (args.options.confirm) {
+            removeRoleAssignment();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleAssignment();
+                }
+            });
+        }
+    }
+    RemoveRoleAssignment(logger, options, cb) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+            method: 'POST',
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    GetGroupPrincipalId(options) {
+        const groupGetCommandOptions = {
+            webUrl: options.webUrl,
+            name: options.groupName,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getGroupOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getGroupOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+    GetUserPrincipalId(options) {
+        const userGetCommandOptions = {
+            webUrl: options.webUrl,
+            email: options.upn,
+            id: undefined,
+            output: 'json',
+            debug: this.debug,
+            verbose: this.verbose
+        };
+        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+            .then((output) => {
+            const getUserOutput = JSON.parse(output.stdout);
+            return Promise.resolve(getUserOutput.Id);
+        }, (err) => {
+            return Promise.reject(err);
+        });
+    }
+}
+_SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_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()
+        });
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initOptions = function _SpoWebRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleAssignmentRemoveCommand_initValidators = function _SpoWebRoleAssignmentRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_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 or upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id or upn or groupName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleAssignmentRemoveCommand();
+//# sourceMappingURL=web-roleassignment-remove.js.map

package/dist/m365/spo/commands/web/web-set.js

@@ -65,7 +65,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web`,
+            url: `${args.options.url}/_api/web`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 accept: 'application/json;odata=nometadata'
@@ -74,7 +74,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             data: payload
         };
         if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.webUrl}...`);
+            logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
         }
         request_1.default
             .patch(requestOptions)
@@ -101,7 +101,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initOptions = function _SpoWebSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -128,7 +128,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands.js

@@ -128,6 +128,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
     LISTITEM_SET: `${prefix} listitem set`,
@@ -192,9 +193,6 @@ exports.default = {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
-    SITE_CLASSIC_ADD: `${prefix} site classic add`,
-    SITE_CLASSIC_LIST: `${prefix} site classic list`,
-    SITE_CLASSIC_SET: `${prefix} site classic set`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
@@ -270,6 +268,8 @@ exports.default = {
     WEB_LIST: `${prefix} web list`,
     WEB_REINDEX: `${prefix} web reindex`,
     WEB_REMOVE: `${prefix} web remove`,
+    WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
+    WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
     WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };