@pnp/cli-microsoft365 5.5.0-beta.10c7ae2 → 5.5.0-beta.3b0d087

package/dist/Auth.js

@@ -535,8 +535,8 @@ class Auth {
         if (pos > -1) {
             resource = resource.substr(0, pos);
         }
-        if (resource === 'https://api.bap.microsoft.com') {
-            // api.bap.microsoft.com is not a valid resource
+        if (resource === 'https://api.bap.microsoft.com' || resource === 'https://api.powerapps.com') {
+            // api.bap.microsoft.com and api.powerapps.com are not valid resources
             // we need to use https://management.azure.com/ instead
             resource = 'https://management.azure.com/';
         }

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js

@@ -14,33 +14,84 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.O365GROUP_RESTORE];
     }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
+        telemetryProps.mailNickname = typeof args.options.mailNickname !== 'undefined';
+        return telemetryProps;
+    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id}...`);
+            logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id || args.options.displayName || args.options.mailNickname}...`);
+        }
+        this
+            .getGroupId(args.options)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        })
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getGroupId(options) {
+        const { id, displayName, mailNickname } = options;
+        if (id) {
+            return Promise.resolve(id);
+        }
+        let filterValue = '';
+        if (displayName) {
+            filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+        }
+        if (mailNickname) {
+            filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/directory/deleteditems/${args.options.id}/restore/`,
+            url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
             headers: {
-                'accept': 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const groups = response.value;
+            if (groups.length === 0) {
+                return Promise.reject(`The specified group '${displayName || mailNickname}' does not exist.`);
+            }
+            if (groups.length > 1) {
+                return Promise.reject(`Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`);
+            }
+            return Promise.resolve(groups[0].id);
+        });
+    }
+    optionSets() {
+        return [['id', 'displayName', 'mailNickname']];
     }
     options() {
         const options = [
             {
-                option: '-i, --id <id>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-d, --displayName [displayName]'
+            },
+            {
+                option: '-m, --mailNickname [mailNickname]'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/base/PowerAppsCommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class PowerAppsCommand extends Command_1.default {
+    get resource() {
+        return 'https://api.powerapps.com';
+    }
+}
+exports.default = PowerAppsCommand;
+//# sourceMappingURL=PowerAppsCommand.js.map

package/dist/m365/pa/commands/app/app-get.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
-const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
-class PaAppGetCommand extends AzmgmtCommand_1.default {
+class PaAppGetCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_1.default.APP_GET;
     }
@@ -24,10 +24,8 @@ class PaAppGetCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (args.options.name) {
-            let requestUrl = '';
-            requestUrl = `${this.resource}providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`;
             const requestOptions = {
-                url: requestUrl,
+                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/pa/commands/app/app-list.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const AzmgmtItemsListCommand_1 = require("../../../base/AzmgmtItemsListCommand");
+const utils_1 = require("../../../../utils");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
-class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
+class PaAppListCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_1.default.APP_LIST;
     }
@@ -19,15 +20,15 @@ class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            if (this.items.length > 0) {
-                this.items.forEach(a => {
+        const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+        utils_1.odata
+            .getAllItems(url)
+            .then((apps) => {
+            if (apps.length > 0) {
+                apps.forEach(a => {
                     a.displayName = a.properties.displayName;
                 });
-                logger.log(this.items);
+                logger.log(apps);
             }
             else {
                 if (this.verbose) {

package/dist/m365/pa/commands/app/app-remove.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
-const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
-class PaAppRemoveCommand extends AzmgmtCommand_1.default {
+class PaAppRemoveCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_1.default.APP_REMOVE;
     }
@@ -23,7 +23,7 @@ class PaAppRemoveCommand extends AzmgmtCommand_1.default {
         }
         const removePaApp = () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
+                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
                 resolveWithFullResponse: true,
                 headers: {
                     accept: 'application/json'

package/dist/m365/pa/commands/connector/connector-export.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
-class PaConnectorExportCommand extends AzmgmtCommand_1.default {
+class PaConnectorExportCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_2.default.CONNECTOR_EXPORT;
     }
@@ -19,7 +19,7 @@ class PaConnectorExportCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args, cb) {
         const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/pa/commands/connector/connector-list.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const AzmgmtItemsListCommand_1 = require("../../../base/AzmgmtItemsListCommand");
+const utils_1 = require("../../../../utils");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
-class PaConnectorListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
+class PaConnectorListCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_2.default.CONNECTOR_LIST;
     }
@@ -17,15 +18,15 @@ class PaConnectorListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCom
         return ['name', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            if (this.items.length > 0) {
-                this.items.forEach(c => {
+        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
+        utils_1.odata
+            .getAllItems(url)
+            .then((connectors) => {
+            if (connectors.length > 0) {
+                connectors.forEach(c => {
                     c.displayName = c.properties.displayName;
                 });
-                logger.log(this.items);
+                logger.log(connectors);
             }
             else {
                 if (this.verbose) {

package/dist/m365/pa/commands/environment/environment-get.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
-class PaEnvironmentGetCommand extends AzmgmtCommand_1.default {
+class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
     }
@@ -18,7 +18,7 @@ class PaEnvironmentGetCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/pa/commands/environment/environment-list.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
-class PaEnvironmentListCommand extends AzmgmtCommand_1.default {
+class PaEnvironmentListCommand extends PowerAppsCommand_1.default {
     get name() {
         return commands_1.default.ENVIRONMENT_LIST;
     }
@@ -18,7 +18,7 @@ class PaEnvironmentListCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -27,7 +27,7 @@ class PaEnvironmentListCommand extends AzmgmtCommand_1.default {
         request_1.default
             .get(requestOptions)
             .then((res) => {
-            if (res.value && res.value.length > 0) {
+            if (res.value.length > 0) {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });

package/dist/m365/planner/commands/plan/plan-add.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_ADD;
@@ -17,6 +16,8 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        telemetryProps.shareWithUserIds = typeof args.options.shareWithUserIds !== 'undefined';
+        telemetryProps.shareWithUserNames = typeof args.options.shareWithUserNames !== 'undefined';
         return telemetryProps;
     }
     defaultProperties() {
@@ -43,16 +44,96 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
             };
             return request_1.default.post(requestOptions);
         })
+            .then(newPlan => this.updatePlanDetails(args.options, newPlan))
             .then((res) => {
             logger.log(res);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    updatePlanDetails(options, newPlan) {
+        const planId = newPlan.id;
+        if (!options.shareWithUserIds && !options.shareWithUserNames) {
+            return Promise.resolve(newPlan);
+        }
+        return Promise
+            .all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)])
+            .then(resArray => {
+            const sharedWith = resArray[0];
+            const etag = resArray[1];
+            const requestOptionsPlanDetails = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    sharedWith: sharedWith
+                }
+            };
+            return request_1.default.patch(requestOptionsPlanDetails);
+        })
+            .then(planDetails => {
+            return Object.assign(Object.assign({}, newPlan), planDetails);
+        });
+    }
+    getPlanDetailsEtag(planId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => response['@odata.etag']);
+    }
+    generateSharedWith(options) {
+        const sharedWith = {};
+        return this
+            .getUserIds(options)
+            .then((userIds) => {
+            userIds.map(x => sharedWith[x] = true);
+            return Promise.resolve(sharedWith);
+        });
+    }
+    getUserIds(options) {
+        if (options.shareWithUserIds) {
+            return Promise.resolve(options.shareWithUserIds.split(','));
+        }
+        // Hitting this section means assignedToUserNames won't be undefined
+        const userNames = options.shareWithUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            const userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        return aadGroup_1.aadGroup
+        return utils_1.aadGroup
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
@@ -62,10 +143,16 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
                 option: '-t, --title <title>'
             },
             {
-                option: "--ownerGroupId [ownerGroupId]"
+                option: '--ownerGroupId [ownerGroupId]'
             },
             {
-                option: "--ownerGroupName [ownerGroupName]"
+                option: '--ownerGroupName [ownerGroupName]'
+            },
+            {
+                option: '--shareWithUserIds [shareWithUserIds]'
+            },
+            {
+                option: '--shareWithUserNames [shareWithUserNames]'
             }
         ];
         const parentOptions = super.options();
@@ -81,6 +168,12 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
+        if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
+            return 'Specify either shareWithUserIds or shareWithUserNames but not both';
+        }
+        if (args.options.shareWithUserIds && !utils_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
+            return 'shareWithUserIds contains invalid GUID';
+        }
         return true;
     }
 }

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

@@ -11,6 +11,11 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets details for the specified custom action';
     }
+    optionSets() {
+        return [
+            ['id', 'title']
+        ];
+    }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.scope = args.options.scope || 'All';
@@ -56,14 +61,34 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
     getCustomAction(options) {
+        const filter = options.id ?
+            `('${encodeURIComponent(options.id)}')` :
+            `?$filter=Title eq '${encodeURIComponent(options.title)}'`;
         const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+            url: `${options.url}/_api/${options.scope}/UserCustomActions${filter}`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request_1.default.get(requestOptions);
+        if (options.id) {
+            return request_1.default
+                .get(requestOptions)
+                .then((res) => {
+                return Promise.resolve(res);
+            });
+        }
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0]);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`No user custom action with title '${options.title}' found`);
+            }
+            return Promise.reject(`Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${res.value.map(a => a.Id).join(', ')}`);
+        });
     }
     /**
      * Get request with `web` scope is send first.
@@ -104,7 +129,10 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --id <id>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-t, --title [title]'
             },
             {
                 option: '-u, --url <url>'
@@ -118,7 +146,7 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected.`;
         }
         if (utils_1.validation.isValidSharePointUrl(args.options.url) !== true) {

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

@@ -12,6 +12,11 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified custom action';
     }
+    optionSets() {
+        return [
+            ['id', 'title']
+        ];
+    }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.scope = args.options.scope || 'All';
@@ -54,16 +59,43 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
-    removeScopedCustomAction(options) {
-        const requestOptions = {
-            url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+    getCustomActionId(options) {
+        if (options.id) {
+            return Promise.resolve(options.id);
+        }
+        const customActionRequestOptions = {
+            url: `${options.url}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
             headers: {
-                accept: 'application/json;odata=nometadata',
-                'X-HTTP-Method': 'DELETE'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request_1.default.post(requestOptions);
+        return request_1.default
+            .get(customActionRequestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].Id);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`No user custom action with title '${options.title}' found`);
+            }
+            return Promise.reject(`Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${res.value.map(a => a.Id).join(', ')}`);
+        });
+    }
+    removeScopedCustomAction(options) {
+        return this
+            .getCustomActionId(options)
+            .then((customActionId) => {
+            const requestOptions = {
+                url: `${options.url}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'DELETE'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     /**
      * Remove request with `web` scope is send first.
@@ -95,7 +127,10 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --id <id>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-t, --title [title]'
             },
             {
                 option: '-u, --url <url>'
@@ -112,7 +147,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
         if (utils_1.validation.isValidSharePointUrl(args.options.url) !== true) {