@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.18ce559

package/dist/m365/spo/commands/site/site-commsite-enable.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 _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
+var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initOptionSets, _SpoSiteCommSiteEnableCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,11 +21,12 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        const designPackageId = this.getDesignPackageId(args.options);
         if (this.verbose) {
-            logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            logger.logToStderr(`Enabling communication site with design package '${designPackageId}' at '${args.options.url}'...`);
         }
         try {
             const requestOptions = {
@@ -42,11 +43,26 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getDesignPackageId(options) {
+        if (options.designPackageId) {
+            return options.designPackageId;
+        }
+        switch (options.designPackage) {
+            case 'Blank':
+                return 'f6cc5403-0d63-442e-96c0-285923709ffc';
+            case 'Showcase':
+                return '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+            case 'Topic':
+            default:
+                return '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        }
+    }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            designPackageId: typeof args.options.designPackageId !== 'undefined'
+            designPackageId: typeof args.options.designPackageId !== 'undefined',
+            designPackage: typeof args.options.designPackage !== 'undefined'
         });
     });
 }, _SpoSiteCommSiteEnableCommand_initOptions = function _SpoSiteCommSiteEnableCommand_initOptions() {
@@ -54,12 +70,25 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
         option: '-u, --url <url>'
     }, {
         option: '-i, --designPackageId [designPackageId]'
+    }, {
+        option: '-p, --designPackage [designPackage]',
+        autocomplete: ["Topic", "Showcase", "Blank"]
+    });
+}, _SpoSiteCommSiteEnableCommand_initOptionSets = function _SpoSiteCommSiteEnableCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['designPackageId', 'designPackage'],
+        runsWhen: (args) => args.options.designPackageId || args.options.designPackage
     });
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.designPackageId &&
             !validation.isValidGuid(args.options.designPackageId)) {
-            return `${args.options.designPackageId} is not a valid GUID`;
+            return `${args.options.designPackageId} is not a valid GUID.`;
+        }
+        if (args.options.designPackage) {
+            if (['Topic', 'Showcase', 'Blank'].indexOf(args.options.designPackage) === -1) {
+                return `${args.options.designPackage} is not a valid designPackage. Allowed values are Topic|Showcase|Blank`;
+            }
         }
         return validation.isValidSharePointUrl(args.options.url);
     });

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

@@ -54,16 +54,14 @@ class SpoSiteListCommand extends SpoCommand {
             },
             data: requestBody
         };
-        const res1 = await request.post(requestOptions);
-        const json = JSON.parse(res1);
-        const response = json[0];
-        logger.log(response);
-        if (response.ErrorInfo) {
-            throw response.ErrorInfo.ErrorMessage;
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
         }
         else {
             const sites = json[json.length - 1];
-            logger.log(sites);
             this.allSites.push(...sites._Child_Items_);
             if (sites.NextStartIndexFromSharePoint) {
                 await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, logger);

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -75,7 +75,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
                 url: url,
                 skipRecycleBin: true,
                 wait: true,
-                confirm: true,
+                force: true,
                 verbose: this.verbose,
                 debug: this.debug
             };

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.js

@@ -11,6 +11,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPLICATIONCUSTOMIZER_GET;
@@ -48,11 +49,15 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                 if (listItemInstances.length === 0) {
                     throw 'The specified application customizer was not found';
                 }
+                listItemInstances.forEach(v => delete v['ID']);
                 if (listItemInstances.length > 1) {
-                    throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.GUID).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances[0]);
                 }
-                listItemInstances.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances[0]);
             }
             else {
                 throw 'The specified application customizer was not found';

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-list.js

@@ -22,8 +22,9 @@ class SpoTenantApplicationCustomizerListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -66,7 +66,8 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            listItemInstances[0] = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-set.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerSetCommand_instances, _SpoTenantApplicationCustomizerSetCommand_initTelemetry, _SpoTenantApplicationCustomizerSetCommand_initOptions, _SpoTenantApplicationCustomizerSetCommand_initValidators, _SpoTenantApplicationCustomizerSetCommand_initOptionSets;
-import os from 'os';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -69,7 +68,9 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${listItemInstances.map(item => `- ${item.Id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -53,11 +54,15 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         try {
             const listItemInstances = await request.get(reqOptions);
             if (listItemInstances?.value.length > 0) {
+                listItemInstances.value.forEach(v => delete v['ID']);
                 if (listItemInstances.value.length > 1) {
-                    throw `Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.value.map(item => item.Id).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances.value);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances.value[0]);
                 }
-                listItemInstances.value.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances.value[0]);
             }
             else {
                 throw 'The specified ListView Command Set was not found';

package/dist/m365/spo/commands/tenant/tenant-commandset-list.js

@@ -25,8 +25,9 @@ class SpoTenantCommandSetListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -90,7 +90,9 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
             throw 'The specified command set was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
-import os from 'os';
+import { Cli } from '../../../../cli/Cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -52,12 +52,12 @@ class SpoTermGetCommand extends SpoCommand {
                     throw `Term with name '${args.options.name}' could not be found.`;
                 }
                 if (terms._Child_Items_.length > 1) {
-                    const disambiguationText = terms._Child_Items_.map(c => {
-                        return `- ${this.getTermId(c.Id)} - ${c.PathOfTerm}`;
-                    }).join(os.EOL);
-                    throw new Error(`Multiple terms with the specific term name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', terms._Child_Items_);
+                    term = await Cli.handleMultipleResultsFound(`Multiple terms with the specific term name found.`, resultAsKeyValuePair);
+                }
+                else {
+                    term = terms._Child_Items_[0];
                 }
-                term = terms._Child_Items_[0];
             }
             else {
                 term = csomResponse;

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

@@ -26,23 +26,23 @@ class SpoUserGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
+            await logger.logToStderr(`Retrieving information for user in site '${args.options.webUrl}'...`);
         }
         let requestUrl = '';
         if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting.encodeQueryParameter(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting.encodeQueryParameter(args.options.id.toString())}')`;
         }
         else if (args.options.email) {
             requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(args.options.email)}')`;
         }
-        else if (args.options.userName) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting.encodeQueryParameter(args.options.userName)}')`;
+        else if (args.options.loginName) {
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting.encodeQueryParameter(args.options.loginName)}')`;
         }
         const requestOptions = {
             url: requestUrl,
             method: 'GET',
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -58,9 +58,9 @@ class SpoUserGetCommand extends SpoCommand {
 _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry = function _SpoUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            email: (!(!args.options.email)).toString(),
-            userName: (!(!args.options.userName)).toString()
+            id: typeof args.options.id !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
+            loginName: typeof args.options.loginName !== 'undefined'
         });
     });
 }, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
@@ -71,7 +71,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     }, {
         option: '--email [email]'
     }, {
-        option: '--userName [userName]'
+        option: '--loginName [loginName]'
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -82,7 +82,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'userName'] });
+    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
 };
 export default new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

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-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;
     }

package/dist/m365/teams/commands/chat/chat-get.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators, _TeamsChatGetCommand_initOptionSets;
-import os from 'os';
 import auth from '../../../../Auth.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
@@ -13,6 +12,7 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { chatUtil } from './chatUtil.js';
+import { Cli } from '../../../../cli/Cli.js';
 class TeamsChatGetCommand extends GraphCommand {
     get name() {
         return commands.CHAT_GET;
@@ -66,10 +66,9 @@ class TeamsChatGetCommand extends GraphCommand {
         if (existingChats.length === 1) {
             return existingChats[0].id;
         }
-        const disambiguationText = existingChats.map(c => {
-            return `- ${c.id}${c.topic && ' - '}${c.topic} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()}`;
-        }).join(os.EOL);
-        throw `Multiple chat conversations with these participants found. Please disambiguate:${os.EOL}${disambiguationText}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
+        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with these participants found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async getChatIdByName(name) {
         const existingChats = await chatUtil.findExistingGroupChatsByName(name);
@@ -79,11 +78,9 @@ class TeamsChatGetCommand extends GraphCommand {
         if (existingChats.length === 1) {
             return existingChats[0].id;
         }
-        const disambiguationText = existingChats.map(c => {
-            const memberstring = c.members.map(m => m.email).join(', ');
-            return `- ${c.id} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()} - ${memberstring}`;
-        }).join(os.EOL);
-        throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
+        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        return result.id;
     }
 }
 _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemetry = function _TeamsChatGetCommand_initTelemetry() {