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

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -46,10 +46,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
             try {
                 let schemaXmlWithResourceTokens = '';
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving field link for field ${args.options.fieldId}...`);
+                    logger.logToStderr(`Retrieving field link for field ${args.options.id}...`);
                 }
                 let requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+                    url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -65,10 +65,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 else {
                     if (this.verbose) {
                         logger.logToStderr('Field link not found. Creating...');
-                        logger.logToStderr(`Retrieving information about site column ${args.options.fieldId}...`);
+                        logger.logToStderr(`Retrieving information about site column ${args.options.id}...`);
                     }
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')?$select=SchemaXmlWithResourceTokens`,
+                        url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')?$select=SchemaXmlWithResourceTokens`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -80,10 +80,10 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                 }
                 if (!this.fieldLink) {
                     if (this.verbose) {
-                        logger.logToStderr(`Retrieving information about field link for field ${args.options.fieldId}...`);
+                        logger.logToStderr(`Retrieving information about field link for field ${args.options.id}...`);
                     }
                     requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(args.options.contentTypeId)}')/fieldlinks('${args.options.fieldId}')`,
+                        url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(args.options.contentTypeId)}')/fieldlinks('${args.options.id}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -95,7 +95,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     }
                 }
                 if (!this.fieldLink) {
-                    throw `Couldn't find field link for field ${args.options.fieldId}`;
+                    throw `Couldn't find field link for field ${args.options.id}`;
                 }
                 let updateHidden = false;
                 let updateRequired = false;
@@ -224,7 +224,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': this.requestDigest
                     },
-                    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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.fieldId}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></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="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><Method Name="Update" Id="7" ObjectPathId="1"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="2" Name="d6667b9e-50fb-0000-2693-032ae7a0df25|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:field:${args.options.id}" /><Method Id="4" ParentId="3" Name="Add"><Parameters><Parameter TypeId="{63fb2c92-8f65-4bbb-a658-b6cd294403f4}"><Property Name="Field" ObjectPathId="2" /></Parameter></Parameters></Method><Identity Id="1" Name="d6667b9e-80f4-0000-2693-05528ff416bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}:web:${this.webId}:contenttype:${formatting_1.formatting.escapeXml(args.options.contentTypeId)}" /><Property Id="3" ParentId="1" Name="FieldLinks" /></ObjectPaths></Request>`
                 };
                 return request_1.default.post(requestOptions);
             })
@@ -246,7 +246,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
         return new Promise((resolve, reject) => {
             if (!requiresUpdate) {
                 if (this.verbose) {
-                    logger.logToStderr(`Schema of field ${args.options.fieldId} is already up-to-date`);
+                    logger.logToStderr(`Schema of field ${args.options.id} is already up-to-date`);
                 }
                 resolve();
                 return;
@@ -258,7 +258,7 @@ class SpoContentTypeFieldSetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Updating field schema...`);
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/fields('${args.options.fieldId}')`,
+                    url: `${args.options.webUrl}/_api/web/fields('${args.options.id}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata',
                         'content-type': 'application/json;odata=nometadata',
@@ -315,7 +315,7 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     }, {
-        option: '-f, --fieldId <fieldId>'
+        option: '-f, --id <id>'
     }, {
         option: '-r, --required [required]'
     }, {
@@ -323,8 +323,8 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     });
 }, _SpoContentTypeFieldSetCommand_initValidators = function _SpoContentTypeFieldSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!validation_1.validation.isValidGuid(args.options.fieldId)) {
-            return `${args.options.fieldId} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (typeof args.options.required !== 'undefined') {
             if (args.options.required !== 'true' &&

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

@@ -52,10 +52,10 @@ class SpoContentTypeGetCommand extends SpoCommand_1.default {
             }
             requestUrl += "/contenttypes";
             if (args.options.id) {
-                requestUrl += `('${encodeURIComponent(args.options.id)}')`;
+                requestUrl += `('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.name) {
-                requestUrl += `?$filter=Name eq '${encodeURIComponent(args.options.name)}'`;
+                requestUrl += `?$filter=Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -127,7 +127,7 @@ _SpoContentTypeGetCommand_instances = new WeakSet(), _SpoContentTypeGetCommand_i
 }, _SpoContentTypeGetCommand_initTypes = function _SpoContentTypeGetCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeGetCommand_initOptionSets = function _SpoContentTypeGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeGetCommand();
 //# sourceMappingURL=contenttype-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,17 +42,10 @@ class SpoContentTypeListCommand extends SpoCommand_1.default {
             try {
                 let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
                 if (args.options.category) {
-                    requestUrl += `?$filter=Group eq '${encodeURIComponent(args.options.category)}'`;
+                    requestUrl += `?$filter=Group eq '${formatting_1.formatting.encodeQueryParameter(args.options.category)}'`;
                 }
-                const requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -17,6 +17,7 @@ var _SpoContentTypeRemoveCommand_instances, _SpoContentTypeRemoveCommand_initTel
 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");
@@ -56,7 +57,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
                             logger.logToStderr(`Looking up the ID of content type ${contentTypeIdentifierLabel}...`);
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${encodeURIComponent(args.options.name)}')`,
+                            url: `${args.options.webUrl}/_api/web/availableContentTypes?$filter=(Name eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}')`,
                             headers: {
                                 accept: 'application/json;odata=nometadata'
                             },
@@ -71,7 +72,7 @@ class SpoContentTypeRemoveCommand extends SpoCommand_1.default {
                         contentTypeId = contentTypeIdResult.value[0].StringId;
                         //execute delete operation
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/contenttypes('${encodeURIComponent(contentTypeId)}')`,
+                            url: `${args.options.webUrl}/_api/web/contenttypes('${formatting_1.formatting.encodeQueryParameter(contentTypeId)}')`,
                             headers: {
                                 'X-HTTP-Method': 'DELETE',
                                 'If-Match': '*',
@@ -127,7 +128,7 @@ _SpoContentTypeRemoveCommand_instances = new WeakSet(), _SpoContentTypeRemoveCom
 }, _SpoContentTypeRemoveCommand_initTypes = function _SpoContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeRemoveCommand_initOptionSets = function _SpoContentTypeRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeRemoveCommand();
 //# sourceMappingURL=contenttype-remove.js.map

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

@@ -162,7 +162,7 @@ _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_i
 }, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoContentTypeSetCommand_initOptionSets = function _SpoContentTypeSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoContentTypeSetCommand();
 //# sourceMappingURL=contenttype-set.js.map

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

@@ -55,7 +55,7 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
                 }
                 const requestBody = this.mapRequestBody(args.options);
                 const requestOptions = {
-                    url: `${args.options.url}/_api/${args.options.scope}/UserCustomActions`,
+                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -184,7 +184,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initOptions = function _SpoCustomActionAddCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-n, --name <name>'
     }, {
@@ -225,7 +225,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
     });
 }, _SpoCustomActionAddCommand_initValidators = function _SpoCustomActionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/customaction/customaction-clear.js

@@ -68,7 +68,7 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
     }
     clearScopedCustomActions(options) {
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions/clear`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions/clear`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -106,7 +106,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     });
 }, _SpoCustomActionClearCommand_initOptions = function _SpoCustomActionClearCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -115,7 +115,7 @@ _SpoCustomActionClearCommand_instances = new WeakSet(), _SpoCustomActionClearCom
     });
 }, _SpoCustomActionClearCommand_initValidators = function _SpoCustomActionClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_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");
@@ -80,10 +81,10 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     }
     getCustomAction(options) {
         const filter = options.id ?
-            `('${encodeURIComponent(options.id)}')` :
-            `?$filter=Title eq '${encodeURIComponent(options.title)}'`;
+            `('${formatting_1.formatting.encodeQueryParameter(options.id)}')` :
+            `?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`;
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions${filter}`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions${filter}`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -157,7 +158,7 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -167,8 +168,9 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected.`;
         }
-        if (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&
@@ -180,7 +182,7 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         return true;
     }));
 }, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_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");
@@ -69,22 +69,9 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
         });
     }
     getCustomActions(options) {
-        const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return new Promise((resolve, reject) => {
-            request_1.default
-                .get(requestOptions)
-                .then((response) => {
-                resolve(response.value);
-            })
-                .catch((error) => {
-                reject(error);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield odata_1.odata.getAllItems(`${options.webUrl}/_api/${options.scope}/UserCustomActions`);
+            return response;
         });
     }
     /**
@@ -127,15 +114,16 @@ _SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListComma
     });
 }, _SpoCustomActionListCommand_initOptions = function _SpoCustomActionListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
     });
 }, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&

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

@@ -17,6 +17,7 @@ var _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initT
 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");
@@ -77,7 +78,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             return Promise.resolve(options.id);
         }
         const customActionRequestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -100,7 +101,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             .getCustomActionId(options)
             .then((customActionId) => {
             const requestOptions = {
-                url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customActionId)}')')`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'
@@ -151,7 +152,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
         autocomplete: ['Site', 'Web', 'All']
@@ -163,8 +164,9 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        if (validation_1.validation.isValidSharePointUrl(args.options.url) !== true) {
-            return 'Missing required option url';
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (typeof isValidUrl === 'string') {
+            return isValidUrl;
         }
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&
@@ -176,7 +178,7 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
         return true;
     }));
 }, _SpoCustomActionRemoveCommand_initOptionSets = function _SpoCustomActionRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoCustomActionRemoveCommand();
 //# sourceMappingURL=customaction-remove.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
 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 base_permissions_1 = require("../../base-permissions");
@@ -74,7 +75,7 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
     updateCustomAction(options) {
         const requestBody = this.mapRequestBody(options);
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'X-HTTP-Method': 'MERGE'
@@ -208,7 +209,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
     });
 }, _SpoCustomActionSetCommand_initOptions = function _SpoCustomActionSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --url <url>'
+        option: '-u, --webUrl <webUrl>'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -254,7 +255,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
         if (validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected`;
         }
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -38,44 +38,60 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
+            try {
+                const eventReceiver = yield this.getEventReceiver(args);
+                logger.log(eventReceiver);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getEventReceiver(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestOptions.url += `/web`;
+            }
+            else {
+                requestOptions.url += '/site';
+            }
             if (args.options.listId) {
-                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                requestOptions.url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                requestOptions.url += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!args.options.scope || args.options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
+            requestOptions.url += '/eventreceivers';
             if (args.options.id) {
-                filter += `receiverid eq (guid'${args.options.id}')`;
+                requestOptions.url += `(guid'${args.options.id}')`;
+                const res = yield request_1.default.get(requestOptions);
+                // Instead of failing, the request will return an 'odata.null' object if the event receiver doesn't exist.
+                if (res && res['odata.null']) {
+                    throw `The specified event receiver '${args.options.id}' does not exist.`;
+                }
+                return res;
             }
             else {
-                filter += `receivername eq '${args.options.name}'`;
-            }
-            const requestOptions = {
-                url: requestUrl + filter,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            try {
+                requestOptions.url += `?$filter=receivername eq '${args.options.name}'`;
                 const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+                if (res.value.length === 0) {
+                    throw `The specified event receiver '${args.options.name}' does not exist.`;
+                }
+                if (res.value && res.value.length > 1) {
+                    throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                }
+                return res.value[0];
             }
         });
     }
@@ -130,7 +146,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
         return true;
     }));
 }, _SpoEventreceiverGetCommand_initOptionSets = function _SpoEventreceiverGetCommand_initOptionSets() {
-    this.optionSets.push(['name', 'id']);
+    this.optionSets.push({ options: ['name', 'id'] });
 };
 module.exports = new SpoEventreceiverGetCommand();
 //# sourceMappingURL=eventreceiver-get.js.map

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -42,14 +43,14 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/`;
             let listUrl = '';
             if (args.options.listId) {
-                listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
             }
             else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
             }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
             if (!args.options.scope || args.options.scope === 'web') {
                 requestUrl += `web/${listUrl}eventreceivers`;
@@ -57,16 +58,9 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             else {
                 requestUrl += 'site/eventreceivers';
             }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);