@pnp/cli-microsoft365 6.0.0-beta.c5ce305 → 6.0.0-beta.c63e3b2

package/dist/m365/spo/commands/{hubsite/hubsite-theme-sync.js → site/site-hubsite-theme-sync.js}

@@ -13,24 +13,24 @@ 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 _SpoHubSiteThemeSyncCommand_instances, _SpoHubSiteThemeSyncCommand_initOptions, _SpoHubSiteThemeSyncCommand_initValidators;
+var _SpoSiteHubSiteThemeSyncCommand_instances, _SpoSiteHubSiteThemeSyncCommand_initOptions, _SpoSiteHubSiteThemeSyncCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteThemeSyncCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteThemeSyncCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteThemeSyncCommand_instances, "m", _SpoHubSiteThemeSyncCommand_initValidators).call(this);
+        _SpoSiteHubSiteThemeSyncCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteThemeSyncCommand_instances, "m", _SpoSiteHubSiteThemeSyncCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_THEME_SYNC;
+        return commands_1.default.SITE_HUBSITE_THEME_SYNC;
     }
     get description() {
-        return 'Applies any theme updates from the parent hub site.';
+        return 'Applies any theme updates from the hub site the site is connected to.';
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -53,12 +53,12 @@ class SpoHubSiteThemeSyncCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoHubSiteThemeSyncCommand_initOptions = function _SpoHubSiteThemeSyncCommand_initOptions() {
+_SpoSiteHubSiteThemeSyncCommand_instances = new WeakSet(), _SpoSiteHubSiteThemeSyncCommand_initOptions = function _SpoSiteHubSiteThemeSyncCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     });
-}, _SpoHubSiteThemeSyncCommand_initValidators = function _SpoHubSiteThemeSyncCommand_initValidators() {
+}, _SpoSiteHubSiteThemeSyncCommand_initValidators = function _SpoSiteHubSiteThemeSyncCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
-module.exports = new SpoHubSiteThemeSyncCommand();
-//# sourceMappingURL=hubsite-theme-sync.js.map
+module.exports = new SpoSiteHubSiteThemeSyncCommand();
+//# sourceMappingURL=site-hubsite-theme-sync.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -91,7 +92,7 @@ class SpoSiteRenameCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             iteration++;
             const requestOptions = {
-                url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${encodeURIComponent(siteUrl)}')?api-version=1.4.7`,
+                url: `${spoAdminUrl}/_api/SiteRenameJobs/GetJobsBySiteUrl(url='${formatting_1.formatting.encodeQueryParameter(siteUrl)}')?api-version=1.4.7`,
                 headers: {
                     'X-AttemptNumber': iteration.toString()
                 },

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

@@ -382,7 +382,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${encodeURIComponent(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         });

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

@@ -13,7 +13,7 @@ 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 _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators;
+var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
@@ -27,6 +27,7 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITEDESIGN_GET;
@@ -96,17 +97,13 @@ _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_ini
     });
 }, _SpoSiteDesignGetCommand_initValidators = function _SpoSiteDesignGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title, but not both.';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoSiteDesignGetCommand_initOptionSets = function _SpoSiteDesignGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoSiteDesignGetCommand();
 //# sourceMappingURL=sitedesign-get.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptAddCommand_instances, _SpoSiteScriptAddCommand_initTelemetry, _SpoSiteScriptAddCommand_initOptions, _SpoSiteScriptAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoSiteScriptAddCommand extends SpoCommand_1.default {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
                 const requestOptions = {
-                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${encodeURIComponent(args.options.title)}'&@description='${encodeURIComponent(args.options.description || '')}'`,
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteScript(Title=@title, Description=@description)?@title='${formatting_1.formatting.encodeQueryParameter(args.options.title)}'&@description='${formatting_1.formatting.encodeQueryParameter(args.options.description || '')}'`,
                     headers: {
                         'X-RequestDigest': requestDigest.FormDigestValue,
                         'content-type': 'application/json;charset=utf-8',

package/dist/m365/spo/commands/spo-search.js

@@ -17,6 +17,7 @@ var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../request");
+const formatting_1 = require("../../../utils/formatting");
 const spo_1 = require("../../../utils/spo");
 const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
@@ -88,7 +89,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         // get the list of selected properties
         const selectPropertiesArray = this.getSelectPropertiesArray(args);
         // transform arg data to query string parameters
-        const propertySelectRequestString = `&selectproperties='${encodeURIComponent(selectPropertiesArray.join(","))}'`;
+        const propertySelectRequestString = `&selectproperties='${formatting_1.formatting.encodeQueryParameter(selectPropertiesArray.join(","))}'`;
         const startRowRequestString = `&startrow=${startRow ? startRow : 0}`;
         const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : ``;
         const sourceIdRequestString = args.options.sourceId ? `&sourceid='${args.options.sourceId}'` : ``;
@@ -97,7 +98,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         const cultureRequestString = args.options.culture ? `&culture=${args.options.culture}` : ``;
         const refinementFiltersRequestString = args.options.refinementFilters ? `&refinementfilters='${args.options.refinementFilters}'` : ``;
         const queryTemplateRequestString = args.options.queryTemplate ? `&querytemplate='${args.options.queryTemplate}'` : ``;
-        const sortListRequestString = args.options.sortList ? `&sortList='${encodeURIComponent(args.options.sortList)}'` : ``;
+        const sortListRequestString = args.options.sortList ? `&sortList='${formatting_1.formatting.encodeQueryParameter(args.options.sortList)}'` : ``;
         const rankingModelIdRequestString = args.options.rankingModelId ? `&rankingmodelid='${args.options.rankingModelId}'` : ``;
         const propertiesRequestString = this.getPropertiesRequestString(args);
         const refinersRequestString = args.options.refiners ? `&refiners='${args.options.refiners}'` : ``;

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityGetCommand_instances, _SpoStorageEntityGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -36,7 +37,7 @@ class SpoStorageEntityGetCommand extends SpoCommand_1.default {
             try {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const requestOptions = {
-                    url: `${spoUrl}/_api/web/GetStorageEntity('${encodeURIComponent(args.options.key)}')`,
+                    url: `${spoUrl}/_api/web/GetStorageEntity('${formatting_1.formatting.encodeQueryParameter(args.options.key)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_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,13 +42,13 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.email) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${encodeURIComponent(args.options.email)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(args.options.email)}')`;
             }
             else if (args.options.loginName) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${encodeURIComponent(args.options.loginName)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
             }
             const requestOptions = {
                 url: requestUrl,

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

@@ -17,6 +17,7 @@ var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUs
 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");
@@ -46,7 +47,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
                     requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
                 }
                 if (args.options.loginName) {
-                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
                 }
                 const requestOptions = {
                     url: requestUrl,

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -39,7 +40,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const userName = `i:0#.f|membership|${args.options.userName}`;
                 const requestOptions = {
-                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${formatting_1.formatting.encodeQueryParameter(`${userName}`)}'`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -17,6 +17,7 @@ var _SpoWebAddCommand_instances, _SpoWebAddCommand_initTelemetry, _SpoWebAddComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -72,7 +73,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.url)}`;
+                    subsiteFullUrl = `${args.options.parentWebUrl}/${formatting_1.formatting.encodeQueryParameter(args.options.url)}`;
                     const requestOptionsPer = {
                         url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                         headers: {

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

@@ -13,7 +13,7 @@ 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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -30,6 +30,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
         __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);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
@@ -43,17 +44,17 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
             }
             try {
-                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                    yield this.AddRoleAssignment(logger, args.options);
+                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    yield this.addRoleAssignment(logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                    yield this.AddRoleAssignment(logger, args.options);
+                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    yield this.addRoleAssignment(logger, args.options);
                 }
                 else {
-                    yield this.AddRoleAssignment(logger, args.options);
+                    yield this.addRoleAssignment(logger, args.options);
                 }
             }
             catch (err) {
@@ -61,7 +62,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    AddRoleAssignment(logger, options) {
+    addRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -76,7 +77,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetRoleDefinitionId(options) {
+    getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
             return Promise.resolve(options.roleDefinitionId);
         }
@@ -95,7 +96,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -111,7 +112,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -165,22 +166,10 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         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;
     }));
+}, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['principalId', 'upn', 'groupName'], ['roleDefinitionId', 'roleDefinitionName']);
 };
 module.exports = new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map

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

@@ -13,7 +13,7 @@ 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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -29,6 +29,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __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);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
@@ -44,15 +45,15 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 }
                 try {
                     if (args.options.upn) {
-                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(logger, args.options);
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(logger, args.options);
                     }
                     else if (args.options.groupName) {
-                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(logger, args.options);
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(logger, args.options);
                     }
                     else {
-                        yield this.RemoveRoleAssignment(logger, args.options);
+                        yield this.removeRoleAssignment(logger, args.options);
                     }
                 }
                 catch (err) {
@@ -75,7 +76,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    RemoveRoleAssignment(logger, options) {
+    removeRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -90,7 +91,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -106,7 +107,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -154,15 +155,10 @@ _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignm
         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;
     }));
+}, _SpoWebRoleAssignmentRemoveCommand_initOptionSets = function _SpoWebRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push(['principalId', 'upn', 'groupName']);
 };
 module.exports = new SpoWebRoleAssignmentRemoveCommand();
 //# sourceMappingURL=web-roleassignment-remove.js.map

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

@@ -0,0 +1,100 @@
+"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 _SpoWebRoleInheritanceBreakCommand_instances, _SpoWebRoleInheritanceBreakCommand_initTelemetry, _SpoWebRoleInheritanceBreakCommand_initOptions, _SpoWebRoleInheritanceBreakCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class SpoWebRoleInheritanceBreakCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleInheritanceBreakCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEINHERITANCE_BREAK;
+    }
+    get description() {
+        return 'Break role inheritance of subsite';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
+            }
+            const breakroleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakroleInheritance();
+            }
+            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 subsite ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield breakroleInheritance();
+                }
+            }
+        });
+    }
+}
+_SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            clearExistingPermissions: !!args.options.clearExistingPermissions,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initOptions = function _SpoWebRoleInheritanceBreakCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initValidators = function _SpoWebRoleInheritanceBreakCommand_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;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleInheritanceBreakCommand();
+//# sourceMappingURL=web-roleinheritance-break.js.map

package/dist/m365/spo/commands.js

@@ -38,6 +38,7 @@ exports.default = {
     CUSTOMACTION_REMOVE: `${prefix} customaction remove`,
     EVENTRECEIVER_GET: `${prefix} eventreceiver get`,
     EVENTRECEIVER_LIST: `${prefix} eventreceiver list`,
+    EVENTRECEIVER_REMOVE: `${prefix} eventreceiver remove`,
     EXTERNALUSER_LIST: `${prefix} externaluser list`,
     FEATURE_DISABLE: `${prefix} feature disable`,
     FEATURE_ENABLE: `${prefix} feature enable`,
@@ -56,8 +57,16 @@ exports.default = {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_ROLEASSIGNMENT_ADD: `${prefix} file roleassignment add`,
+    FILE_ROLEASSIGNMENT_REMOVE: `${prefix} file roleassignment remove`,
+    FILE_ROLEINHERITANCE_BREAK: `${prefix} file roleinheritance break`,
     FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
+    FILE_VERSION_CLEAR: `${prefix} file version clear`,
+    FILE_VERSION_GET: `${prefix} file version get`,
+    FILE_VERSION_LIST: `${prefix} file version list`,
+    FILE_VERSION_REMOVE: `${prefix} file version remove`,
+    FILE_VERSION_RESTORE: `${prefix} file version restore`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
     FOLDER_GET: `${prefix} folder get`,
@@ -65,6 +74,9 @@ exports.default = {
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
+    FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,
+    FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
+    FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
     FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
@@ -72,9 +84,9 @@ exports.default = {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_REMOVE: `${prefix} group user remove`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_REMOVE: `${prefix} group member remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,
@@ -89,7 +101,6 @@ exports.default = {
     HUBSITE_RIGHTS_GRANT: `${prefix} hubsite rights grant`,
     HUBSITE_RIGHTS_REVOKE: `${prefix} hubsite rights revoke`,
     HUBSITE_SET: `${prefix} hubsite set`,
-    HUBSITE_THEME_SYNC: `${prefix} hubsite theme sync`,
     HUBSITE_UNREGISTER: `${prefix} hubsite unregister`,
     KNOWLEDGEHUB_GET: `${prefix} knowledgehub get`,
     KNOWLEDGEHUB_REMOVE: `${prefix} knowledgehub remove`,
@@ -131,6 +142,7 @@ exports.default = {
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_ADD: `${prefix} listitem roleassignment add`,
     LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
@@ -201,6 +213,9 @@ exports.default = {
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
     SITE_GROUPIFY: `${prefix} site groupify`,
+    SITE_HUBSITE_CONNECT: `${prefix} site hubsite connect`,
+    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
+    SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
@@ -274,6 +289,7 @@ exports.default = {
     WEB_REMOVE: `${prefix} web remove`,
     WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
     WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
+    WEB_ROLEINHERITANCE_BREAK: `${prefix} web roleinheritance break`,
     WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };

package/dist/m365/teams/commands/Meeting.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Meeting.js.map