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

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-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,8 +81,8 @@ 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.webUrl}/_api/${options.scope}/UserCustomActions${filter}`,
             headers: {
@@ -181,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.webUrl}/_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;
         });
     }
     /**

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.webUrl}/_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.webUrl}/_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'
@@ -177,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.webUrl}/_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'

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);

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

@@ -40,74 +40,57 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const getEventReceiversOutput = yield this.getEventReceivers(args.options);
-                const eventReceivers = JSON.parse(getEventReceiversOutput.stdout);
-                if (!eventReceivers.length) {
-                    throw Error(`Specified event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`} cannot be found`);
+            if (args.options.confirm) {
+                yield this.removeEventReceiver(args.options);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove event receiver with ${args.options.id ? `id ${args.options.id}` : `name ${args.options.name}`}?`
+                });
+                if (result.continue) {
+                    yield this.removeEventReceiver(args.options);
                 }
-                if (eventReceivers.length > 1) {
-                    throw Error(`Multiple eventreceivers with ${args.options.id !== undefined ? `id ${args.options.id} found` : `name ${args.options.name}, ids: ${eventReceivers.map(x => x.ReceiverId)} found`}`);
+            }
+        });
+    }
+    removeEventReceiver(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/${options.scope || 'web'}`;
+                if (options.listId) {
+                    requestUrl += `/lists('${options.listId}')`;
                 }
-                if (args.options.confirm) {
-                    yield this.removeEventReceiver(args.options);
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
                 }
-                else {
-                    const result = yield Cli_1.Cli.prompt({
-                        type: 'confirm',
-                        name: 'continue',
-                        default: false,
-                        message: `Are you sure you want to remove event receiver with ${args.options.id !== undefined ? `id ${args.options.id}` : `name ${args.options.name}`}?`
-                    });
-                    if (result.continue) {
-                        yield this.removeEventReceiver(args.options);
-                    }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
+                const rerId = yield this.getEventReceiverId(options);
+                requestUrl += `/eventreceivers('${rerId}')`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    removeEventReceiver(options) {
+    getEventReceiverId(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
-            if (options.listId) {
-                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/`;
-            }
-            else if (options.listTitle) {
-                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/`;
-            }
-            else if (options.listUrl) {
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
-                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!options.scope || options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
-            }
             if (options.id) {
-                filter += `receiverid eq (guid'${options.id}')`;
+                return options.id;
             }
-            else {
-                filter += `receivername eq '${options.name}'`;
-            }
-            const requestOptions = {
-                url: requestUrl + filter,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            yield request_1.default.delete(requestOptions);
-        });
-    }
-    getEventReceivers(options) {
-        return __awaiter(this, void 0, void 0, function* () {
             const getOptions = {
                 webUrl: options.webUrl,
                 listId: options.listId,
@@ -119,7 +102,9 @@ class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            return yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const eventReceiver = JSON.parse(commandOutput.stdout);
+            return eventReceiver.ReceiverId;
         });
     }
 }
@@ -129,10 +114,10 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
+            scope: args.options.scope || 'web',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {
@@ -176,7 +161,7 @@ _SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemov
         return true;
     }));
 }, _SpoEventreceiverRemoveCommand_initOptionSets = function _SpoEventreceiverRemoveCommand_initOptionSets() {
-    this.optionSets.push(['name', 'id']);
+    this.optionSets.push({ options: ['name', 'id'] });
 };
 module.exports = new SpoEventreceiverRemoveCommand();
 //# sourceMappingURL=eventreceiver-remove.js.map

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_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");
@@ -36,17 +36,10 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const scope = (args.options.scope) ? args.options.scope : 'Web';
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             try {
-                const features = yield request_1.default.get(requestOptions);
-                if (features.value && features.value.length > 0) {
-                    logger.log(features.value);
+                const features = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
+                if (features && features.length > 0) {
+                    logger.log(features);
                 }
                 else {
                     if (this.verbose) {

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

@@ -112,7 +112,7 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_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");
@@ -51,16 +51,9 @@ class SpoFieldListCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listUrl}fields`,
-                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(`${args.options.webUrl}/_api/web/${listUrl}fields`);
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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

@@ -181,7 +181,7 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
         return true;
     }));
 }, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'group']);
+    this.optionSets.push({ options: ['id', 'title', 'group'] });
 };
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

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

@@ -181,7 +181,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         return true;
     }));
 }, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map