@pnp/cli-microsoft365 6.0.0-beta.f73c4f8 → 6.0.0-beta.f94d570

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/planner/commands/plan/plan-get.js

@@ -11,9 +11,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_GET;
     }
-    alias() {
-        return [commands_1.default.PLAN_DETAILS_GET];
-    }
     get description() {
         return 'Get a Microsoft Planner plan';
     }
@@ -31,7 +28,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         return ['id', 'title', 'createdDateTime', 'owner', '@odata.etag'];
     }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.PLAN_DETAILS_GET, commands_1.default.PLAN_GET);
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;

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

@@ -23,7 +23,6 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
         telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
@@ -43,10 +42,6 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
@@ -227,7 +222,6 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         const options = [
             { option: '-t, --title <title>' },
             { option: '--planId [planId]' },
-            { option: '--planName [planName]' },
             { option: '--planTitle [planTitle]' },
             { option: '--ownerGroupId [ownerGroupId]' },
             { option: '--ownerGroupName [ownerGroupName]' },
@@ -255,16 +249,16 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (!args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

package/dist/m365/planner/commands/task/task-get.js

@@ -11,9 +11,6 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TASK_GET;
     }
-    alias() {
-        return [commands_1.default.TASK_DETAILS_GET];
-    }
     get description() {
         return 'Retrieve the specified planner task';
     }
@@ -24,25 +21,15 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
         telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
         telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.TASK_DETAILS_GET, commands_1.default.TASK_GET);
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
         }
-        // This check has been added to support task details get alias. Needs to be removed when deprecation is removed. 
-        if (args.options.taskId) {
-            args.options.id = args.options.taskId;
-        }
         this
             .getTaskId(args.options)
             .then(taskId => this.getTask(taskId))
@@ -157,13 +144,11 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     }
     options() {
         const options = [
-            { option: '--taskId [taskId]' },
             { option: '-i, --id [id]' },
             { option: '-t, --title [title]' },
             { option: '--bucketId [bucketId]' },
             { option: '--bucketName [bucketName]' },
             { option: '--planId [planId]' },
-            { option: '--planName [planName]' },
             { option: '--planTitle [planTitle]' },
             { option: '--ownerGroupId [ownerGroupId]' },
             { option: '--ownerGroupName [ownerGroupName]' }
@@ -178,16 +163,16 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
         if (args.options.title && args.options.bucketId && args.options.bucketName) {
             return 'Specify either bucketId or bucketName when using title but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

package/dist/m365/planner/commands/task/task-list.js

@@ -19,7 +19,6 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
         telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
         telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
@@ -29,10 +28,6 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
     }
     commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
@@ -150,9 +145,6 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
             {
                 option: '--planId [planId]'
             },
-            {
-                option: '--planName [planName]'
-            },
             {
                 option: '--planTitle [planTitle]'
             },
@@ -170,16 +162,16 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         if (args.options.bucketId && args.options.bucketName) {
             return 'To retrieve tasks from a bucket, specify bucketId or bucketName, but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

package/dist/m365/planner/commands/task/task-set.js

@@ -23,7 +23,6 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
         telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
@@ -42,10 +41,6 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
         if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
             this.handleError('This command does not support application permissions.', logger, cb);
             return;
@@ -269,7 +264,6 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
             { option: '-i, --id <id>' },
             { option: '-t, --title [title]' },
             { option: '--planId [planId]' },
-            { option: '--planName [planName]' },
             { option: '--planTitle [planTitle]' },
             { option: '--ownerGroupId [ownerGroupId]' },
             { option: '--ownerGroupName [ownerGroupName]' },
@@ -293,16 +287,16 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         if (args.options.bucketId && args.options.bucketName) {
             return 'Specify either bucketId or bucketName but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
         if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {

package/dist/m365/planner/commands.js

@@ -8,7 +8,6 @@ exports.default = {
     BUCKET_SET: `${prefix} bucket set`,
     BUCKET_REMOVE: `${prefix} bucket remove`,
     PLAN_ADD: `${prefix} plan add`,
-    PLAN_DETAILS_GET: `${prefix} plan details get`,
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     PLAN_REMOVE: `${prefix} plan remove`,
@@ -16,7 +15,6 @@ exports.default = {
     TASK_CHECKLISTITEM_ADD: `${prefix} task checklistitem add`,
     TASK_CHECKLISTITEM_LIST: `${prefix} task checklistitem list`,
     TASK_CHECKLISTITEM_REMOVE: `${prefix} task checklistitem remove`,
-    TASK_DETAILS_GET: `${prefix} task details get`,
     TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_REFERENCE_ADD: `${prefix} task reference add`,

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

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

@@ -17,10 +17,19 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
         telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
         telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
         telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
+        telemetryProps.title = typeof args.options.title !== 'undefined';
         return telemetryProps;
     }
+    optionSets() {
+        return [
+            ['id', 'title', 'fieldTitle']
+        ];
+    }
     commandAction(logger, args, cb) {
+        if (args.options.fieldTitle) {
+            args.options.title = args.options.fieldTitle;
+            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
+        }
         let listRestUrl = '';
         if (args.options.listId) {
             listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
@@ -37,7 +46,7 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.fieldTitle)}')`;
+            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
         }
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -72,6 +81,9 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             },
             {
                 option: '--fieldTitle [fieldTitle]'
+            },
+            {
+                option: '-t, --title [title]'
             }
         ];
         const parentOptions = super.options();
@@ -82,9 +94,6 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.fieldTitle) {
-            return 'Specify id or fieldTitle, one is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }