@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -49,7 +49,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    addRoleAssignment(logger, options) {
+    async addRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -59,14 +59,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
-            return Promise.resolve(options.roleDefinitionId);
+            return options.roleDefinitionId;
         }
         const roleDefinitionListCommandOptions = {
             webUrl: options.webUrl,
@@ -74,16 +71,12 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } })
-            .then((output) => {
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return Promise.resolve(roleDefinitionId);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
+        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+        return roleDefinitionId;
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -91,15 +84,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -108,13 +97,9 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -27,29 +27,8 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const removeRoleAssignment = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-            }
-            try {
-                if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else {
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeRoleAssignment();
+            await this.removeRoleAssignment(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -59,11 +38,32 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
             });
             if (result.continue) {
-                await removeRoleAssignment();
+                await this.removeRoleAssignment(logger, args.options);
             }
         }
     }
-    removeRoleAssignment(logger, options) {
+    async removeRoleAssignment(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing role assignment from web ${options.webUrl}...`);
+        }
+        try {
+            if (options.upn) {
+                options.principalId = await this.getUserPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else if (options.groupName) {
+                options.principalId = await this.getGroupPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else {
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async removeRoleAssignmentWithOptions(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -73,12 +73,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -86,15 +83,11 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -103,13 +96,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/web/web-roleinheritance-break.js

@@ -27,24 +27,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
         }
-        const breakroleInheritance = async () => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await breakroleInheritance();
+            await this.breakRoleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -54,10 +38,26 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
                 message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
             });
             if (result.continue) {
-                await breakroleInheritance();
+                await this.breakRoleInheritance(args.options);
             }
         }
     }
+    async breakRoleInheritance(options) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/breakroleinheritance(${!options.clearExistingPermissions})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -27,25 +27,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
         }
-        const resetWebRoleInheritance = async () => {
-            try {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-                    method: 'POST',
-                    headers: {
-                        'accept': 'application/json;odata=nometadata',
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await resetWebRoleInheritance();
+            await this.resetWebRoleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -55,10 +38,27 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
                 message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
             });
             if (result.continue) {
-                await resetWebRoleInheritance();
+                await this.resetWebRoleInheritance(args.options);
             }
         }
     }
+    async resetWebRoleInheritance(options) {
+        try {
+            const requestOptions = {
+                url: `${options.webUrl}/_api/web/resetroleinheritance`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/web/web-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoWebSetCommand_instances, _SpoWebSetCommand_initTelemetry, _SpoWebSetCommand_initOptions, _SpoWebSetCommand_initTypes, _SpoWebSetCommand_initValidators;
+var _SpoWebSetCommand_instances, _a, _SpoWebSetCommand_initTelemetry, _SpoWebSetCommand_initOptions, _SpoWebSetCommand_initTypes, _SpoWebSetCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -55,7 +55,7 @@ class SpoWebSetCommand extends SpoCommand {
         }
         if (typeof args.options.searchScope !== 'undefined') {
             const searchScope = args.options.searchScope.toLowerCase();
-            payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
+            payload.SearchScope = _a.searchScopeOptions.indexOf(searchScope);
         }
         try {
             const requestOptions = {
@@ -97,7 +97,7 @@ class SpoWebSetCommand extends SpoCommand {
         return true;
     }
 }
-_SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = function _SpoWebSetCommand_initTelemetry() {
+_a = SpoWebSetCommand, _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = function _SpoWebSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.description !== 'undefined',
@@ -143,7 +143,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
         autocomplete: ['true', 'false']
     }, {
         option: '--searchScope [searchScope]',
-        autocomplete: SpoWebSetCommand.searchScopeOptions
+        autocomplete: _a.searchScopeOptions
     }, {
         option: '--welcomePage [welcomePage]'
     });
@@ -170,7 +170,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
         }
         if (typeof args.options.searchScope !== 'undefined') {
             const searchScope = args.options.searchScope.toString().toLowerCase();
-            if (SpoWebSetCommand.searchScopeOptions.indexOf(searchScope) < 0) {
+            if (_a.searchScopeOptions.indexOf(searchScope) < 0) {
                 return `${args.options.searchScope} is not a valid value for searchScope. Allowed values are DefaultScope|Tenant|Hub|Site`;
             }
         }

package/dist/m365/spo/commands.js

@@ -156,7 +156,11 @@ export default {
     LIST_WEBHOOK_REMOVE: `${prefix} list webhook remove`,
     LIST_WEBHOOK_SET: `${prefix} list webhook set`,
     LISTITEM_ADD: `${prefix} listitem add`,
+    LISTITEM_ATTACHMENT_ADD: `${prefix} listitem attachment add`,
+    LISTITEM_ATTACHMENT_GET: `${prefix} listitem attachment get`,
     LISTITEM_ATTACHMENT_LIST: `${prefix} listitem attachment list`,
+    LISTITEM_ATTACHMENT_REMOVE: `${prefix} listitem attachment remove`,
+    LISTITEM_ATTACHMENT_SET: `${prefix} listitem attachment set`,
     LISTITEM_BATCH_ADD: `${prefix} listitem batch add`,
     LISTITEM_BATCH_SET: `${prefix} listitem batch set`,
     LISTITEM_GET: `${prefix} listitem get`,

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsAppListCommand_instances, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
+var _TeamsAppListCommand_instances, _a, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -38,7 +38,7 @@ class TeamsAppListCommand extends GraphCommand {
         }
     }
 }
-_TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
+_a = TeamsAppListCommand, _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             distributionMethod: args.options.distributionMethod || false
@@ -47,13 +47,13 @@ _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemet
 }, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
     this.options.unshift({
         option: '--distributionMethod [distributionMethod]',
-        autocomplete: TeamsAppListCommand.allowedDistributionMethods
+        autocomplete: _a.allowedDistributionMethods
     });
 }, _TeamsAppListCommand_initValidators = function _TeamsAppListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.distributionMethod &&
-            TeamsAppListCommand.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
-            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${TeamsAppListCommand.allowedDistributionMethods.join(', ')}`;
+            _a.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
+            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${_a.allowedDistributionMethods.join(', ')}`;
         }
         return true;
     });

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

@@ -3,9 +3,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators;
+var _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -22,20 +23,21 @@ class TeamsAppRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppRemoveCommand_instances, "m", _TeamsAppRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const { id: appId } = args.options;
         const removeApp = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing app with ID ${args.options.id}`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                }
-            };
             try {
+                const appId = await this.getAppId(args.options, logger);
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing app with ID ${appId}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
                 await request.delete(requestOptions);
             }
             catch (err) {
@@ -50,33 +52,65 @@ class TeamsAppRemoveCommand extends GraphCommand {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
+                message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?`
             });
             if (result.continue) {
                 await removeApp();
             }
         }
     }
+    async getAppId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving app Id...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const app = response.value[0];
+        if (!app) {
+            throw `The specified Teams app does not exist`;
+        }
+        if (response.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Teams apps with name '${options.name}' found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        return app.id;
+    }
 }
 _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
+            force: (!(!args.options.force)).toString(),
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
         });
     });
 }, _TeamsAppRemoveCommand_initOptions = function _TeamsAppRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
     }, {
         option: '-f, --force'
     });
 }, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _TeamsAppRemoveCommand_initOptionSets = function _TeamsAppRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

package/dist/m365/teams/commands/channel/channel-add.js

@@ -8,6 +8,8 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsChannelAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_ADD;
@@ -42,7 +44,9 @@ class TeamsChannelAddCommand extends GraphCommand {
             throw `The specified team does not exist in the Microsoft Teams`;
         }
         if (matchingTeams.length > 1) {
-            throw `Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${matchingTeams.join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams teams with name ${args.options.teamName} found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return matchingTeams[0];
     }

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -4,13 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsChannelMemberAddCommand_instances, _TeamsChannelMemberAddCommand_initTelemetry, _TeamsChannelMemberAddCommand_initOptions, _TeamsChannelMemberAddCommand_initValidators, _TeamsChannelMemberAddCommand_initOptionSets;
-import os from 'os';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class TeamsChannelMemberAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_MEMBER_ADD;
@@ -91,11 +91,11 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         return channelItem.id;
     }
     async getUserId(args) {
-        if (args.options.userId) {
-            return args.options.userId.split(',').map(u => u.trim());
+        if (args.options.userIds) {
+            return args.options.userIds.split(',').map(u => u.trim());
         }
         const tasks = [];
-        const userDisplayNames = args.options.userDisplayName && args.options.userDisplayName.split(',').map(u => u.trim());
+        const userDisplayNames = args.options.userDisplayNames && args.options.userDisplayNames.split(',').map(u => u.trim());
         for (const userName of userDisplayNames) {
             tasks.push(this.getSingleUser(userName));
         }
@@ -115,7 +115,9 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
             throw `The specified user '${userDisplayName}' does not exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple users with display name '${userDisplayName}' found. Please disambiguate:${os.EOL}${response.value.map(x => `- ${x.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple users with display name '${userDisplayName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return userItem.id;
     }
@@ -127,8 +129,8 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
             teamName: typeof args.options.teamName !== 'undefined',
             channelId: typeof args.options.channelId !== 'undefined',
             channelName: typeof args.options.channelName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userDisplayName: typeof args.options.userDisplayName !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
+            userDisplayNames: typeof args.options.userDisplayNames !== 'undefined',
             owner: args.options.owner
         });
     });
@@ -142,9 +144,9 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
     }, {
         option: '--channelName [channelName]'
     }, {
-        option: '--userId [userId]'
+        option: '--userIds [userIds]'
     }, {
-        option: '--userDisplayName [userDisplayName]'
+        option: '--userDisplayNames [userDisplayNames]'
     }, {
         option: '--owner'
     });
@@ -159,7 +161,7 @@ _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddC
         return true;
     });
 }, _TeamsChannelMemberAddCommand_initOptionSets = function _TeamsChannelMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userDisplayName'] });
+    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userIds', 'userDisplayNames'] });
 };
 export default new TeamsChannelMemberAddCommand();
 //# sourceMappingURL=channel-member-add.js.map

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -123,7 +123,9 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
             throw 'The specified member does not exist in the Microsoft Teams channel';
         }
         if (conversationMembers.length > 1) {
-            throw `Multiple Microsoft Teams channel members with name ${args.options.userName} found: ${response.value.map(x => x.userId)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', conversationMembers);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams channel members with name ${args.options.userName} found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return conversationMember.id;
     }

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -10,6 +10,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class TeamsChannelMemberSetCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_MEMBER_SET;
@@ -101,7 +102,9 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
             throw 'The specified member does not exist in the Microsoft Teams channel';
         }
         if (conversationMembers.length > 1) {
-            throw `Multiple Microsoft Teams channel members with name ${args.options.userName} found: ${response.value.map(x => x.userId)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', conversationMembers);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams channel members with name ${args.options.userName} found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return conversationMember.id;
     }