@pnp/cli-microsoft365 6.0.0-beta.a9609a1 → 6.0.0-beta.aa5918d

package/dist/m365/spo/commands/page/page-section-add.js

@@ -17,6 +17,7 @@ var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 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");
@@ -47,7 +48,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
             }
             try {
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')?$select=CanvasContent1,IsPageCheckedOutToCurrentUser`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -57,7 +58,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 canvasContent = JSON.parse(res.CanvasContent1 || "[{\"controlType\":0,\"pageSettingsSlice\":{\"isDefaultDescription\":true,\"isDefaultThumbnail\":true}}]");
                 if (!res.IsPageCheckedOutToCurrentUser) {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/checkoutpage`,
+                        url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/checkoutpage`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -88,7 +89,7 @@ class SpoPageSectionAddCommand extends SpoCommand_1.default {
                 }
                 canvasContent.splice(pos, 0, ...columnsToAdd);
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${encodeURIComponent(pageFullName)}')/savepage`,
+                    url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting_1.formatting.encodeQueryParameter(pageFullName)}')/savepage`,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata'

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

@@ -17,6 +17,7 @@ var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetC
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -249,7 +250,7 @@ class SpoPageSetCommand extends SpoCommand_1.default {
                 }
                 else {
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${encodeURIComponent(args.options.publishMessage || '').replace(/'/g, '%39')}'&@a2=1`,
+                        url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting_1.formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
                         headers: {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',

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

@@ -18,7 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("./RoleType");
 class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -48,14 +50,25 @@ class SpoRoleDefinitionListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const response = yield request_1.default.get(requestOptions);
-                logger.log(response.value);
+                const res = yield request_1.default.get(requestOptions);
+                const response = this.setFriendlyPermissions(res.value);
+                logger.log(response);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            const permissions = new base_permissions_1.BasePermissions();
+            permissions.high = r.BasePermissions.High;
+            permissions.low = r.BasePermissions.Low;
+            r.BasePermissionsValue = permissions.parse();
+            r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+        });
+        return response;
+    }
 }
 _SpoRoleDefinitionListCommand_instances = new WeakSet(), _SpoRoleDefinitionListCommand_initOptions = function _SpoRoleDefinitionListCommand_initOptions() {
     this.options.unshift({

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators, _SpoSiteAppPermissionAddCommand_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 GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -58,10 +59,10 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         }
         let endpoint = "";
         if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         else {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         const appRequestOptions = {
             url: endpoint,

package/dist/m365/spo/commands/site/site-hubsite-connect.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_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");
@@ -38,7 +39,7 @@ class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
             try {
                 const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
                 const requestOptions = {
-                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${encodeURIComponent(args.options.id)}')`,
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         accept: 'application/json;odata=nometadata'

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;
@@ -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;
@@ -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.js

@@ -62,6 +62,11 @@ exports.default = {
     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`,
@@ -70,6 +75,7 @@ exports.default = {
     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`,
@@ -86,14 +92,15 @@ exports.default = {
     HOMESITE_GET: `${prefix} homesite get`,
     HOMESITE_REMOVE: `${prefix} homesite remove`,
     HOMESITE_SET: `${prefix} homesite set`,
+    HUBSITE_CONNECT: `${prefix} hubsite connect`,
     HUBSITE_DATA_GET: `${prefix} hubsite data get`,
+    HUBSITE_DISCONNECT: `${prefix} hubsite disconnect`,
     HUBSITE_GET: `${prefix} hubsite get`,
     HUBSITE_LIST: `${prefix} hubsite list`,
     HUBSITE_REGISTER: `${prefix} hubsite register`,
     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`,
@@ -206,8 +213,9 @@ exports.default = {
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
     SITE_GROUPIFY: `${prefix} site groupify`,
-    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
     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`,

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

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

package/dist/m365/teams/commands/app/app-install.js

@@ -17,6 +17,7 @@ var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _T
 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 GraphCommand_1 = require("../../../base/GraphCommand");
@@ -43,10 +44,10 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 yield this.validateUser(args, logger);
                 let url = `${this.resource}/v1.0`;
                 if (args.options.teamId) {
-                    url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+                    url += `/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
                 }
                 else {
-                    url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                    url += `/users/${formatting_1.formatting.encodeQueryParameter(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
                 }
                 const requestOptions = {
                     url: url,

package/dist/m365/teams/commands/app/app-list.js

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsAppListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -56,7 +57,7 @@ class TeamsAppListCommand extends GraphCommand_1.default {
                 this
                     .getTeamId(args)
                     .then((teamId) => {
-                    let endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/installedApps?$expand=teamsApp`;
+                    let endpoint = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/installedApps?$expand=teamsApp`;
                     if (!args.options.all) {
                         endpoint += `&$filter=teamsApp/distributionMethod eq 'organization'`;
                     }

package/dist/m365/teams/commands/app/app-publish.js

@@ -35,23 +35,22 @@ class TeamsAppPublishCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const fullPath = path.resolve(args.options.filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
-                headers: {
-                    "content-type": "application/zip",
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: fs.readFileSync(fullPath)
-            };
             try {
-                const res = yield request_1.default.post(requestOptions);
-                if (res && res.id) {
-                    logger.log(res.id);
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
                 }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
+                    headers: {
+                        'content-type': 'application/zip',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);