@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -46,7 +46,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                             accept: 'application/json;odata=nometadata'
                         },
                         data: {
-                            taskId: args.options.taskId
+                            taskId: args.options.id
                         },
                         responseType: 'json'
                     };
@@ -64,7 +64,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the site design task ${args.options.taskId}?`
+                    message: `Are you sure you want to remove the site design task ${args.options.id}?`
                 });
                 if (result.continue) {
                     yield removeSiteDesignTask();
@@ -81,14 +81,14 @@ _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRem
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --taskId <taskId>'
+        option: '-i, --id <id>'
     }, {
         option: '--confirm'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.taskId)) {
-            return `${args.options.taskId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

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/tenant/tenant-recyclebinitem-remove.js

@@ -44,14 +44,14 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                     const adminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const res = yield spo_1.spo.ensureFormDigest(adminUrl, logger, this.context, this.debug);
                     if (this.verbose) {
-                        logger.logToStderr(`Removing deleted site collection ${args.options.url}...`);
+                        logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
                     }
                     const requestOptions = {
                         url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                         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><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                     };
                     const processQuery = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(processQuery);
@@ -94,7 +94,7 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the deleted site collection ${args.options.url} from tenant recycle bin?`
+                    message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
                 });
                 if (result.continue) {
                     yield removeDeletedSite();
@@ -112,14 +112,14 @@ _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecyc
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initOptions = function _SpoTenantRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     }, {
         option: '--confirm'
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -45,7 +45,7 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
                         'content-type': 'application/json;charset=utf-8'
                     },
                     data: {
-                        siteUrl: args.options.url
+                        siteUrl: args.options.siteUrl
                     }
                 };
                 const res = yield request_1.default.post(requestOptions);
@@ -65,12 +65,12 @@ _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecy
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

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

@@ -222,7 +222,7 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
         return true;
     }));
 }, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map

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

@@ -143,7 +143,7 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
         return true;
     }));
 }, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

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

@@ -96,7 +96,7 @@ _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initT
         return true;
     }));
 }, _SpoTermGroupGetCommand_initOptionSets = function _SpoTermGroupGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoTermGroupGetCommand();
 //# sourceMappingURL=term-group-get.js.map

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

@@ -113,7 +113,7 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
         return true;
     }));
 }, _SpoTermListCommand_initOptionSets = function _SpoTermListCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName'], ['termSetId', 'termSetName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] }, { options: ['termSetId', 'termSetName'] });
 };
 module.exports = new SpoTermListCommand();
 //# sourceMappingURL=term-list.js.map

package/dist/m365/spo/commands/term/term-set-add.js

@@ -171,7 +171,7 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
         return true;
     }));
 }, _SpoTermSetAddCommand_initOptionSets = function _SpoTermSetAddCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetAddCommand();
 //# sourceMappingURL=term-set-add.js.map

package/dist/m365/spo/commands/term/term-set-get.js

@@ -108,7 +108,7 @@ _SpoTermSetGetCommand_instances = new WeakSet(), _SpoTermSetGetCommand_initTelem
         return true;
     }));
 }, _SpoTermSetGetCommand_initOptionSets = function _SpoTermSetGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name'], ['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['id', 'name'] }, { options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetGetCommand();
 //# sourceMappingURL=term-set-get.js.map

package/dist/m365/spo/commands/term/term-set-list.js

@@ -102,7 +102,7 @@ _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTel
         return true;
     }));
 }, _SpoTermSetListCommand_initOptionSets = function _SpoTermSetListCommand_initOptionSets() {
-    this.optionSets.push(['termGroupId', 'termGroupName']);
+    this.optionSets.push({ options: ['termGroupId', 'termGroupName'] });
 };
 module.exports = new SpoTermSetListCommand();
 //# sourceMappingURL=term-set-list.js.map

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,
@@ -94,7 +95,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'email', 'loginName']);
+    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

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,
@@ -102,7 +103,7 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'loginName']);
+    this.optionSets.push({ options: ['id', 'loginName'] });
 };
 module.exports = new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

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");
@@ -37,7 +38,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
         return 'Create new subsite';
     }
     getExcludedOptionsWithUrls() {
-        return ['webUrl'];
+        return ['url'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -55,7 +56,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,
@@ -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.webUrl)}`;
+                    subsiteFullUrl = `${args.options.parentWebUrl}/${formatting_1.formatting.encodeQueryParameter(args.options.url)}`;
                     const requestOptionsPer = {
                         url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                         headers: {
@@ -134,7 +135,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

@@ -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("../roledefinition/RoleType");
 class SpoWebGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -35,7 +37,7 @@ class SpoWebGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let url = `${args.options.webUrl}/_api/web`;
+            let url = `${args.options.url}/_api/web`;
             if (args.options.withGroups) {
                 url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
             }
@@ -48,6 +50,12 @@ class SpoWebGetCommand extends SpoCommand_1.default {
             };
             try {
                 const webProperties = yield request_1.default.get(requestOptions);
+                if (args.options.withPermissions) {
+                    requestOptions.url = `${args.options.url}/_api/web/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    const response = yield request_1.default.get(requestOptions);
+                    const roleAssignments = this.setFriendlyPermissions(response.value);
+                    webProperties.RoleAssignments = roleAssignments;
+                }
                 logger.log(webProperties);
             }
             catch (err) {
@@ -55,21 +63,36 @@ class SpoWebGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            r.RoleDefinitionBindings.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;
+    }
 }
 _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = function _SpoWebGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            withGroups: typeof args.options.withGroups !== 'undefined'
+            withGroups: !!args.options.withGroups,
+            withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoWebGetCommand_initOptions = function _SpoWebGetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--withGroups'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebListCommand_instances, _SpoWebListCommand_initOptions, _SpoWebListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,22 +38,15 @@ class SpoWebListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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';
             }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const webProperties = yield request_1.default.get(requestOptions);
-                logger.log(webProperties.value);
+                const webProperties = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(webProperties);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -63,10 +56,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 validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

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

@@ -39,12 +39,12 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             let requestDigest = '';
             let webIdentityResp;
             try {
-                const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const res = yield spo_1.spo.getRequestDigest(args.options.url);
                 requestDigest = res.FormDigestValue;
                 if (this.debug) {
                     logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
                 }
-                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+                const identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
                 webIdentityResp = identityResp;
                 if (this.debug) {
                     logger.logToStderr(`Retrieved web identity.`);
@@ -52,18 +52,18 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Checking if the site is a no-script site...`);
                 }
-                const isNoScriptSite = yield propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+                const isNoScriptSite = yield propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
                 if (isNoScriptSite) {
                     if (this.verbose) {
                         logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
                     }
-                    yield this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp);
+                    yield 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'
                     },
@@ -72,7 +72,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 const webProperties = yield request_1.default.get(requestOptions);
                 let searchVersion = webProperties.vti_x005f_searchversion || 0;
                 searchVersion++;
-                yield propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+                yield propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
             }
             catch (err) {
                 this.handleRejectedPromise(err);
@@ -127,10 +127,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 validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map

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

@@ -38,7 +38,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeWeb = () => __awaiter(this, void 0, void 0, function* () {
                 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'
@@ -46,7 +46,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} ...`);
                 }
                 try {
                     yield request_1.default.post(requestOptions);
@@ -63,7 +63,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}`
                 });
                 if (result.continue) {
                     yield removeWeb();
@@ -80,12 +80,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 validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map