@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.38e141b

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

@@ -1,9 +1,17 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 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 spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoContentTypeHubGetCommand extends SpoCommand_1.default {
@@ -13,59 +21,54 @@ class SpoContentTypeHubGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Returns the URL of the SharePoint Content Type Hub of the Tenant';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving Content Type Hub URL`);
-            }
-            const requestOptions = {
-                url: `${spoUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}">
-  <Actions>
-    <ObjectPath Id="2" ObjectPathId="1" />
-    <ObjectIdentityQuery Id="3" ObjectPathId="1" />
-    <ObjectPath Id="5" ObjectPathId="4" />
-    <ObjectIdentityQuery Id="6" ObjectPathId="4" />
-    <Query Id="7" ObjectPathId="4">
-      <Query SelectAllProperties="false">
-        <Properties>
-          <Property Name="ContentTypePublishingHub" ScalarProperty="true" />
-        </Properties>
-      </Query>
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving Content Type Hub URL`);
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}">
+<Actions>
+  <ObjectPath Id="2" ObjectPathId="1" />
+  <ObjectIdentityQuery Id="3" ObjectPathId="1" />
+  <ObjectPath Id="5" ObjectPathId="4" />
+  <ObjectIdentityQuery Id="6" ObjectPathId="4" />
+  <Query Id="7" ObjectPathId="4">
+    <Query SelectAllProperties="false">
+      <Properties>
+        <Property Name="ContentTypePublishingHub" ScalarProperty="true" />
+      </Properties>
     </Query>
-  </Actions>
-  <ObjectPaths>
-    <StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" />
-    <Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" />
-  </ObjectPaths>
+  </Query>
+</Actions>
+<ObjectPaths>
+  <StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" />
+  <Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" />
+</ObjectPaths>
 </Request>`
-            };
-            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));
-            }
-            else {
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
                 const result = {
                     ContentTypePublishingHub: json[json.length - 1]["ContentTypePublishingHub"]
                 };
                 logger.log(result);
-                cb();
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoContentTypeHubGetCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionAddCommand_instances, _SpoCustomActionAddCommand_initTelemetry, _SpoCustomActionAddCommand_initOptions, _SpoCustomActionAddCommand_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 base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -47,47 +47,50 @@ class SpoCustomActionAddCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    commandAction(logger, args, cb) {
-        if (!args.options.scope) {
-            args.options.scope = 'Web';
-        }
-        const requestBody = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((customAction) => {
-            if (this.verbose) {
-                logger.logToStderr({
-                    ClientSideComponentId: customAction.ClientSideComponentId,
-                    ClientSideComponentProperties: customAction.ClientSideComponentProperties,
-                    CommandUIExtension: customAction.CommandUIExtension,
-                    Description: customAction.Description,
-                    Group: customAction.Group,
-                    Id: customAction.Id,
-                    ImageUrl: customAction.ImageUrl,
-                    Location: customAction.Location,
-                    Name: customAction.Name,
-                    RegistrationId: customAction.RegistrationId,
-                    RegistrationType: customAction.RegistrationType,
-                    Rights: JSON.stringify(customAction.Rights),
-                    Scope: args.options.scope,
-                    ScriptBlock: customAction.ScriptBlock,
-                    ScriptSrc: customAction.ScriptSrc,
-                    Sequence: customAction.Sequence,
-                    Title: customAction.Title,
-                    Url: customAction.Url,
-                    VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (!args.options.scope) {
+                    args.options.scope = 'Web';
+                }
+                const requestBody = this.mapRequestBody(args.options);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const customAction = yield request_1.default.post(requestOptions);
+                if (this.verbose) {
+                    logger.logToStderr({
+                        ClientSideComponentId: customAction.ClientSideComponentId,
+                        ClientSideComponentProperties: customAction.ClientSideComponentProperties,
+                        CommandUIExtension: customAction.CommandUIExtension,
+                        Description: customAction.Description,
+                        Group: customAction.Group,
+                        Id: customAction.Id,
+                        ImageUrl: customAction.ImageUrl,
+                        Location: customAction.Location,
+                        Name: customAction.Name,
+                        RegistrationId: customAction.RegistrationId,
+                        RegistrationType: customAction.RegistrationType,
+                        Rights: JSON.stringify(customAction.Rights),
+                        Scope: args.options.scope,
+                        ScriptBlock: customAction.ScriptBlock,
+                        ScriptSrc: customAction.ScriptSrc,
+                        Sequence: customAction.Sequence,
+                        Title: customAction.Title,
+                        Url: customAction.Url,
+                        VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
+                    });
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     mapRequestBody(options) {
         const requestBody = {
@@ -222,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 = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -257,7 +260,7 @@ _SpoCustomActionAddCommand_instances = new WeakSet(), _SpoCustomActionAddCommand
         if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
             return 'Invalid option sequence. Expected value in range from 0 to 65536';
         }
-        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
             return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
         }
         if (args.options.clientSideComponentProperties && !args.options.clientSideComponentId) {

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

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionClearCommand_instances, _SpoCustomActionClearCommand_initTelemetry, _SpoCustomActionClearCommand_initOptions, _SpoCustomActionClearCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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 SpoCustomActionClearCommand extends SpoCommand_1.default {
@@ -35,34 +35,36 @@ class SpoCustomActionClearCommand extends SpoCommand_1.default {
     get description() {
         return 'Deletes all custom actions in the collection';
     }
-    commandAction(logger, args, cb) {
-        const clearCustomActions = () => {
-            (() => {
-                if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
-                    return this.clearScopedCustomActions(args.options);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearCustomActions = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
+                        yield this.clearScopedCustomActions(args.options);
+                    }
+                    else {
+                        yield this.clearAllScopes(args.options);
+                    }
                 }
-                return this.clearAllScopes(args.options);
-            })()
-                .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            clearCustomActions();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear all the user custom actions with scope ${chalk.yellow(args.options.scope || 'All')}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    clearCustomActions();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield clearCustomActions();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to clear all the user custom actions with scope ${chalk.yellow(args.options.scope || 'All')}?`
+                });
+                if (result.continue) {
+                    yield clearCustomActions();
+                }
+            }
+        });
     }
     clearScopedCustomActions(options) {
         const requestOptions = {
@@ -113,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 = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        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,7 +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 utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionGetCommand extends SpoCommand_1.default {
@@ -34,44 +34,49 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets details for the specified custom action';
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
-                return this.getCustomAction(args.options);
-            }
-            return this.searchAllScopes(args.options);
-        })()
-            .then((customAction) => {
-            if (customAction["odata.null"] === true) {
-                if (this.verbose) {
-                    logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let customAction;
+                if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
+                    customAction = yield this.getCustomAction(args.options);
+                }
+                else {
+                    customAction = yield this.searchAllScopes(args.options);
+                }
+                if (customAction["odata.null"] === true) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+                    }
+                }
+                else {
+                    logger.log({
+                        ClientSideComponentId: customAction.ClientSideComponentId,
+                        ClientSideComponentProperties: customAction.ClientSideComponentProperties,
+                        CommandUIExtension: customAction.CommandUIExtension,
+                        Description: customAction.Description,
+                        Group: customAction.Group,
+                        Id: customAction.Id,
+                        ImageUrl: customAction.ImageUrl,
+                        Location: customAction.Location,
+                        Name: customAction.Name,
+                        RegistrationId: customAction.RegistrationId,
+                        RegistrationType: customAction.RegistrationType,
+                        Rights: JSON.stringify(customAction.Rights),
+                        Scope: this.humanizeScope(customAction.Scope),
+                        ScriptBlock: customAction.ScriptBlock,
+                        ScriptSrc: customAction.ScriptSrc,
+                        Sequence: customAction.Sequence,
+                        Title: customAction.Title,
+                        Url: customAction.Url,
+                        VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
+                    });
                 }
             }
-            else {
-                logger.log({
-                    ClientSideComponentId: customAction.ClientSideComponentId,
-                    ClientSideComponentProperties: customAction.ClientSideComponentProperties,
-                    CommandUIExtension: customAction.CommandUIExtension,
-                    Description: customAction.Description,
-                    Group: customAction.Group,
-                    Id: customAction.Id,
-                    ImageUrl: customAction.ImageUrl,
-                    Location: customAction.Location,
-                    Name: customAction.Name,
-                    RegistrationId: customAction.RegistrationId,
-                    RegistrationType: customAction.RegistrationType,
-                    Rights: JSON.stringify(customAction.Rights),
-                    Scope: this.humanizeScope(customAction.Scope),
-                    ScriptBlock: customAction.ScriptBlock,
-                    ScriptSrc: customAction.ScriptSrc,
-                    Sequence: customAction.Sequence,
-                    Title: customAction.Title,
-                    Url: customAction.Url,
-                    VersionOfUserCustomAction: customAction.VersionOfUserCustomAction
-                });
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getCustomAction(options) {
         const filter = options.id ?
@@ -159,10 +164,10 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
     });
 }, _SpoCustomActionGetCommand_initValidators = function _SpoCustomActionGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected.`;
         }
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -16,7 +16,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 utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionListCommand extends SpoCommand_1.default {
@@ -36,32 +36,37 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
-    commandAction(logger, args, cb) {
-        const scope = args.options.scope ? args.options.scope : 'All';
-        (() => {
-            if (this.debug) {
-                logger.logToStderr(`Attempt to get custom actions list with scope: ${scope}`);
-                logger.logToStderr('');
-            }
-            if (scope && scope.toLowerCase() !== "all") {
-                return this.getCustomActions(args.options);
-            }
-            return this.searchAllScopes(args.options);
-        })()
-            .then((customActions) => {
-            if (customActions.length === 0) {
-                if (this.verbose) {
-                    logger.logToStderr(`Custom actions not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const scope = args.options.scope ? args.options.scope : 'All';
+                if (this.debug) {
+                    logger.logToStderr(`Attempt to get custom actions list with scope: ${scope}`);
+                    logger.logToStderr('');
                 }
-            }
-            else {
-                if (args.options.output !== 'json') {
-                    customActions.forEach(a => a.Scope = this.humanizeScope(a.Scope));
+                let customActions;
+                if (scope && scope.toLowerCase() !== "all") {
+                    customActions = yield this.getCustomActions(args.options);
+                }
+                else {
+                    customActions = yield this.searchAllScopes(args.options);
+                }
+                if (customActions.length === 0) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Custom actions not found`);
+                    }
+                }
+                else {
+                    if (args.options.output !== 'json') {
+                        customActions.forEach(a => a.Scope = this.humanizeScope(a.Scope));
+                    }
+                    logger.log(customActions);
                 }
-                logger.log(customActions);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     getCustomActions(options) {
         const requestOptions = {
@@ -129,7 +134,7 @@ _SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListComma
     });
 }, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initTelemetry, _SpoCustomActionRemoveCommand_initOptions, _SpoCustomActionRemoveCommand_initValidators, _SpoCustomActionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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 SpoCustomActionRemoveCommand extends SpoCommand_1.default {
@@ -35,41 +35,42 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified custom action';
     }
-    commandAction(logger, args, cb) {
-        const removeCustomAction = () => {
-            (() => {
-                if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
-                    return this.removeScopedCustomAction(args.options);
-                }
-                return this.searchAllScopes(args.options);
-            })()
-                .then((customAction) => {
-                if (this.verbose) {
-                    if (customAction && customAction["odata.null"] === true) {
-                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeCustomAction = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let customAction;
+                    if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
+                        customAction = yield this.removeScopedCustomAction(args.options);
+                    }
+                    else {
+                        customAction = yield this.searchAllScopes(args.options);
+                    }
+                    if (this.verbose) {
+                        if (customAction && customAction["odata.null"] === true) {
+                            logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+                        }
                     }
                 }
-                cb();
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeCustomAction();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the ${args.options.id} user custom action?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeCustomAction();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeCustomAction();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the ${args.options.id} user custom action?`
+                });
+                if (result.continue) {
+                    yield removeCustomAction();
+                }
+            }
+        });
     }
     getCustomActionId(options) {
         if (options.id) {
@@ -159,10 +160,10 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     });
 }, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }