@pnp/cli-microsoft365 6.4.0-beta.aacf728 → 6.4.0-beta.e3b0f5c

package/dist/Command.js

@@ -117,6 +117,7 @@ class Command {
                     .then(result => result.missingRequireOptionValue);
                 args.options[command.options[i].name] = missingRequireOptionValue;
             }
+            this.processOptions(args.options);
             return true;
         });
     }

package/dist/m365/flow/commands/owner/owner-add.js

@@ -0,0 +1,147 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _FlowOwnerAddCommand_instances, _FlowOwnerAddCommand_initTelemetry, _FlowOwnerAddCommand_initOptions, _FlowOwnerAddCommand_initOptionSets, _FlowOwnerAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const commands_1 = require("../../commands");
+class FlowOwnerAddCommand extends AzmgmtCommand_1.default {
+    get name() {
+        return commands_1.default.OWNER_ADD;
+    }
+    get description() {
+        return 'Assigns permissions to a Power Automate flow';
+    }
+    constructor() {
+        super();
+        _FlowOwnerAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerAddCommand_instances, "m", _FlowOwnerAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Assigning permissions for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName} with permissions ${args.options.roleName} to Power Automate flow ${args.options.flowName}`);
+                }
+                let id = '';
+                if (args.options.userId) {
+                    id = args.options.userId;
+                }
+                else if (args.options.userName) {
+                    id = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+                }
+                else if (args.options.groupId) {
+                    id = args.options.groupId;
+                }
+                else {
+                    id = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                }
+                let type;
+                if (args.options.userId || args.options.userName) {
+                    type = 'User';
+                }
+                else {
+                    type = 'Group';
+                }
+                const requestOptions = {
+                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    data: {
+                        put: [
+                            {
+                                properties: {
+                                    principal: {
+                                        id: id,
+                                        type: type
+                                    },
+                                    roleName: args.options.roleName
+                                }
+                            }
+                        ]
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_FlowOwnerAddCommand_instances = new WeakSet(), _FlowOwnerAddCommand_initTelemetry = function _FlowOwnerAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin,
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined'
+        });
+    });
+}, _FlowOwnerAddCommand_initOptions = function _FlowOwnerAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleName <roleName>',
+        autocomplete: FlowOwnerAddCommand.allowedRoleNames
+    }, {
+        option: '--asAdmin'
+    });
+}, _FlowOwnerAddCommand_initOptionSets = function _FlowOwnerAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+}, _FlowOwnerAddCommand_initValidators = function _FlowOwnerAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID.`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID.`;
+        }
+        if (FlowOwnerAddCommand.allowedRoleNames.indexOf(args.options.roleName) === -1) {
+            return `${args.options.roleName} is not a valid roleName. Valid values are: ${FlowOwnerAddCommand.allowedRoleNames.join(', ')}`;
+        }
+        return true;
+    }));
+};
+FlowOwnerAddCommand.allowedRoleNames = ['CanView', 'CanEdit'];
+module.exports = new FlowOwnerAddCommand();
+//# sourceMappingURL=owner-add.js.map

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -0,0 +1,147 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
+const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const commands_1 = require("../../commands");
+class FlowOwnerRemoveCommand extends AzmgmtCommand_1.default {
+    get name() {
+        return commands_1.default.OWNER_REMOVE;
+    }
+    get description() {
+        return 'Removes owner permissions to a Power Automate flow';
+    }
+    constructor() {
+        super();
+        _FlowOwnerRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerRemoveCommand_instances, "m", _FlowOwnerRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing owner ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName} from flow ${args.options.flowName} in environment ${args.options.environmentName}`);
+                }
+                const removeFlowOwner = () => __awaiter(this, void 0, void 0, function* () {
+                    let idToRemove = '';
+                    if (args.options.userId) {
+                        idToRemove = args.options.userId;
+                    }
+                    else if (args.options.userName) {
+                        idToRemove = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+                    }
+                    else if (args.options.groupId) {
+                        idToRemove = args.options.groupId;
+                    }
+                    else {
+                        idToRemove = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        data: {
+                            delete: [
+                                {
+                                    id: idToRemove
+                                }
+                            ]
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                });
+                if (args.options.confirm) {
+                    yield removeFlowOwner();
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to remove owner '${args.options.groupId || args.options.groupName || args.options.userId || args.options.userName}' from the specified flow?`
+                    });
+                    if (result.continue) {
+                        yield removeFlowOwner();
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_FlowOwnerRemoveCommand_instances = new WeakSet(), _FlowOwnerRemoveCommand_initTelemetry = function _FlowOwnerRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _FlowOwnerRemoveCommand_initOptions = function _FlowOwnerRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '--confirm'
+    });
+}, _FlowOwnerRemoveCommand_initValidators = function _FlowOwnerRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID.`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID.`;
+        }
+        return true;
+    }));
+}, _FlowOwnerRemoveCommand_initOptionSets = function _FlowOwnerRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+};
+module.exports = new FlowOwnerRemoveCommand();
+//# sourceMappingURL=owner-remove.js.map

package/dist/m365/flow/commands/run/run-list.js

@@ -42,7 +42,7 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             if (this.verbose) {
                 logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
             }
-            let url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+            let url = `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
             const filters = this.getFilters(args.options);
             if (filters.length > 0) {
                 url += `&$filter=${filters.join(' and ')}`;
@@ -86,7 +86,8 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             status: typeof args.options.status !== 'undefined',
             triggerStartTime: typeof args.options.triggerStartTime !== 'undefined',
-            triggerEndTime: typeof args.options.triggerEndTime !== 'undefined'
+            triggerEndTime: typeof args.options.triggerEndTime !== 'undefined',
+            asAdmin: !!args.options.asAdmin
         });
     });
 }, _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
@@ -101,6 +102,8 @@ _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initTelemetry
         option: '--triggerStartTime [triggerStartTime]'
     }, {
         option: '--triggerEndTime [triggerEndTime]'
+    }, {
+        option: '--asAdmin'
     });
 }, _FlowRunListCommand_initValidators = function _FlowRunListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/flow/commands.js

@@ -11,7 +11,9 @@ exports.default = {
     EXPORT: `${prefix} export`,
     GET: `${prefix} get`,
     LIST: `${prefix} list`,
+    OWNER_ADD: `${prefix} owner add`,
     OWNER_LIST: `${prefix} owner list`,
+    OWNER_REMOVE: `${prefix} owner remove`,
     REMOVE: `${prefix} remove`,
     RUN_CANCEL: `${prefix} run cancel`,
     RUN_GET: `${prefix} run get`,

package/dist/m365/planner/commands/roster/roster-member-get.js

@@ -0,0 +1,98 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PlannerRosterMemberGetCommand_instances, _PlannerRosterMemberGetCommand_initTelemetry, _PlannerRosterMemberGetCommand_initOptions, _PlannerRosterMemberGetCommand_initOptionSets, _PlannerRosterMemberGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+class PlannerRosterMemberGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.ROSTER_MEMBER_GET;
+    }
+    get description() {
+        return 'Gets a member of the specified Microsoft Planner Roster';
+    }
+    constructor() {
+        super();
+        _PlannerRosterMemberGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerRosterMemberGetCommand_instances, "m", _PlannerRosterMemberGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving member ${args.options.userName || args.options.userId} from the Microsoft Planner Roster`);
+            }
+            try {
+                const userId = yield this.getUserId(args);
+                const requestOptions = {
+                    url: `${this.resource}/beta/planner/rosters/${args.options.rosterId}/members/${userId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.get(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUserId(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userId) {
+                return args.options.userId;
+            }
+            return aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+        });
+    }
+}
+_PlannerRosterMemberGetCommand_instances = new WeakSet(), _PlannerRosterMemberGetCommand_initTelemetry = function _PlannerRosterMemberGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _PlannerRosterMemberGetCommand_initOptions = function _PlannerRosterMemberGetCommand_initOptions() {
+    this.options.unshift({
+        option: '--rosterId <rosterId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _PlannerRosterMemberGetCommand_initOptionSets = function _PlannerRosterMemberGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+}, _PlannerRosterMemberGetCommand_initValidators = function _PlannerRosterMemberGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    }));
+};
+module.exports = new PlannerRosterMemberGetCommand();
+//# sourceMappingURL=roster-member-get.js.map

package/dist/m365/planner/commands.js

@@ -15,6 +15,7 @@ exports.default = {
     ROSTER_ADD: `${prefix} roster add`,
     ROSTER_GET: `${prefix} roster get`,
     ROSTER_MEMBER_ADD: `${prefix} roster member add`,
+    ROSTER_MEMBER_GET: `${prefix} roster member get`,
     ROSTER_MEMBER_LIST: `${prefix} roster member list`,
     ROSTER_MEMBER_REMOVE: `${prefix} roster member remove`,
     ROSTER_REMOVE: `${prefix} roster remove`,

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

@@ -77,14 +77,26 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
                 }
                 return customAction;
             }
-            const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
-            if (customActions.length === 1) {
-                return customActions[0];
+            else if (options.title) {
+                const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
+                if (customActions.length === 1) {
+                    return customActions[0];
+                }
+                if (customActions.length === 0) {
+                    throw `No user custom action with title '${options.title}' found`;
+                }
+                throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
             }
-            if (customActions.length === 0) {
-                throw `No user custom action with title '${options.title}' found`;
+            else {
+                const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `ClientSideComponentId eq guid'${options.clientSideComponentId}'`);
+                if (customActions.length === 0) {
+                    throw `No user custom action with ClientSideComponentId '${options.clientSideComponentId}' found`;
+                }
+                if (customActions.length > 1) {
+                    throw `Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found. Please disambiguate using IDs: ${customActions.map((customAction) => customAction.Id).join(', ')}`;
+                }
+                return customActions[0];
             }
-            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
         });
     }
     humanizeScope(scope) {
@@ -100,6 +112,9 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
 _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand_initTelemetry = function _SpoCustomActionGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             scope: args.options.scope || 'All'
         });
     });
@@ -108,6 +123,8 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -130,10 +147,13 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
                 return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
             }
         }
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+            return `${args.options.clientSideComponentId} is not a valid GUID.`;
+        }
         return true;
     }));
 }, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
 };
 module.exports = new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map