@pnp/cli-microsoft365 6.0.0-beta.4e32416 → 6.0.0-beta.55cbe4a

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoEventreceiverGetCommand extends SpoCommand_1.default {
@@ -34,45 +36,48 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a specific event receiver attached to the web, site or list (if any of the list options are filled in) by receiver name of id';
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/`;
-        let listUrl = '';
-        let filter = '?$filter=';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        if (!args.options.scope || args.options.scope === 'web') {
-            requestUrl += `web/${listUrl}eventreceivers`;
-        }
-        else {
-            requestUrl += 'site/eventreceivers';
-        }
-        if (args.options.id) {
-            filter += `receiverid eq (guid'${args.options.id}')`;
-        }
-        else {
-            filter += `receivername eq '${args.options.name}'`;
-        }
-        const requestOptions = {
-            url: requestUrl + filter,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/`;
+            let listUrl = '';
+            let filter = '?$filter=';
+            if (args.options.listId) {
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else if (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('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestUrl += `web/${listUrl}eventreceivers`;
+            }
+            else {
+                requestUrl += 'site/eventreceivers';
+            }
+            if (args.options.id) {
+                filter += `receiverid eq (guid'${args.options.id}')`;
+            }
+            else {
+                filter += `receivername eq '${args.options.name}'`;
+            }
+            const requestOptions = {
+                url: requestUrl + filter,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetCommand_initTelemetry = function _SpoEventreceiverGetCommand_initTelemetry() {
@@ -105,7 +110,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
     });
 }, _SpoEventreceiverGetCommand_initValidators = function _SpoEventreceiverGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -113,7 +118,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

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

@@ -16,7 +16,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 utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoEventreceiverListCommand extends SpoCommand_1.default {
@@ -36,38 +37,41 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['ReceiverId', 'ReceiverName'];
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/`;
-        let listUrl = '';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
-        }
-        if (!args.options.scope || args.options.scope === 'web') {
-            requestUrl += `web/${listUrl}eventreceivers`;
-        }
-        else {
-            requestUrl += 'site/eventreceivers';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/`;
+            let listUrl = '';
+            if (args.options.listId) {
+                listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+            }
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestUrl += `web/${listUrl}eventreceivers`;
+            }
+            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);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCommand_initTelemetry = function _SpoEventreceiverListCommand_initTelemetry() {
@@ -94,7 +98,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
     });
 }, _SpoEventreceiverListCommand_initValidators = function _SpoEventreceiverListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -102,7 +106,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

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

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoExternalUserListCommand_instances, _SpoExternalUserListCommand_initTelemetry, _SpoExternalUserListCommand_initOptions, _SpoExternalUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoExternalUserListCommand extends SpoCommand_1.default {
@@ -35,63 +36,59 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists external users in the tenant';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about external users...`);
-            }
-            const position = parseInt(args.options.position || '0');
-            const pageSize = parseInt(args.options.pageSize || '10');
-            const sortOrder = args.options.sortOrder === 'desc' ? 1 : 0;
-            let payload = '';
-            if (args.options.siteUrl) {
-                payload = `<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="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
-            }
-            else {
-                payload = `<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="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: payload
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
-            }
-            else {
-                const results = json.pop();
-                if (results.TotalUserCount > 0) {
-                    logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
-                        delete e._ObjectType_;
-                        const dateChunks = e.WhenCreated
-                            .replace('/Date(', '')
-                            .replace(')/', '')
-                            .split(',')
-                            .map(c => {
-                            return parseInt(c);
-                        });
-                        e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
-                        return e;
-                    }));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving information about external users...`);
+                }
+                const position = parseInt(args.options.position || '0');
+                const pageSize = parseInt(args.options.pageSize || '10');
+                const sortOrder = args.options.sortOrder === 'desc' ? 1 : 0;
+                let payload = '';
+                if (args.options.siteUrl) {
+                    payload = `<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="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                }
+                else {
+                    payload = `<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="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: payload
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const results = json.pop();
+                    if (results.TotalUserCount > 0) {
+                        logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
+                            delete e._ObjectType_;
+                            const dateChunks = e.WhenCreated
+                                .replace('/Date(', '')
+                                .replace(')/', '')
+                                .split(',')
+                                .map(c => {
+                                return parseInt(c);
+                            });
+                            e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
+                            return e;
+                        }));
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListCommand_initTelemetry = function _SpoExternalUserListCommand_initTelemetry() {
@@ -143,7 +140,7 @@ _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListComma
             return `${args.options.sortOrder} is not a valid sortOrder value. Allowed values asc|desc`;
         }
         if (args.options.siteUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         }
         return true;
     }));

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

@@ -33,28 +33,33 @@ class SpoFeatureDisableCommand extends SpoCommand_1.default {
     get description() {
         return 'Disables feature for the specified site or web';
     }
-    commandAction(logger, args, cb) {
-        let scope = args.options.scope;
-        let force = args.options.force;
-        if (!scope) {
-            scope = "web";
-        }
-        if (!force) {
-            force = false;
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
-        }
-        const url = `${args.options.webUrl}/_api/${scope}/features/remove(featureId=guid'${args.options.id}',force=${force})`;
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let scope = args.options.scope;
+            let force = args.options.force;
+            if (!scope) {
+                scope = "web";
+            }
+            if (!force) {
+                force = false;
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            if (this.verbose) {
+                logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
+            }
+            const url = `${args.options.webUrl}/_api/${scope}/features/remove(featureId=guid'${args.options.id}',force=${force})`;
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_initTelemetry = function _SpoFeatureDisableCommand_initTelemetry() {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFeatureEnableCommand_instances, _SpoFeatureEnableCommand_initTelemetry, _SpoFeatureEnableCommand_initOptions, _SpoFeatureEnableCommand_initValidators, _SpoFeatureEnableCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFeatureEnableCommand extends SpoCommand_1.default {
@@ -34,28 +34,33 @@ class SpoFeatureEnableCommand extends SpoCommand_1.default {
     get description() {
         return 'Enables feature for the specified site or web';
     }
-    commandAction(logger, args, cb) {
-        let scope = args.options.scope;
-        let force = args.options.force;
-        if (!scope) {
-            scope = "web";
-        }
-        if (!force) {
-            force = false;
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
-        }
-        const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let scope = args.options.scope;
+            let force = args.options.force;
+            if (!scope) {
+                scope = "web";
+            }
+            if (!force) {
+                force = false;
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            if (this.verbose) {
+                logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
+            }
+            const url = `${args.options.webUrl}/_api/${scope}/features/add(featureId=guid'${args.options.id}',force=${force})`;
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_initTelemetry = function _SpoFeatureEnableCommand_initTelemetry() {
@@ -83,7 +88,7 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
     this.types.string.push('scope', 's');

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

@@ -16,7 +16,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 utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFeatureListCommand extends SpoCommand_1.default {
@@ -33,28 +33,31 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists Features activated in the specified site or site collection';
     }
-    commandAction(logger, args, cb) {
-        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'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((features) => {
-            if (features.value && features.value.length > 0) {
-                logger.log(features.value);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No activated Features found');
+    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);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No activated Features found');
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTelemetry = function _SpoFeatureListCommand_initTelemetry() {
@@ -78,7 +81,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoFeatureListCommand();