@pnp/cli-microsoft365 7.3.0-beta.01256d2 → 7.3.0-beta.1c23854

package/dist/m365/teams/commands/app/app-install.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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -29,6 +29,7 @@ class TeamsAppInstallCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             await this.validateUser(args, logger);
+            const appId = await this.getAppId(args.options);
             let url = `${this.resource}/v1.0`;
             if (args.options.teamId) {
                 url += `/teams/${formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
@@ -44,7 +45,7 @@ class TeamsAppInstallCommand extends GraphCommand {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`
                 }
             };
             await request.post(requestOptions);
@@ -69,7 +70,7 @@ class TeamsAppInstallCommand extends GraphCommand {
             verbose: args.options.verbose
         };
         try {
-            const res = await Cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+            const res = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(res.stderr);
             }
@@ -82,20 +83,45 @@ class TeamsAppInstallCommand extends GraphCommand {
             throw `User with ID ${args.options.userId} not found. Original error: ${err.error.message}`;
         }
     }
+    async getAppId(options) {
+        if (options.id) {
+            return options.id;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'`,
+            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;
+    }
 }
 _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             teamId: typeof args.options.teamId !== 'undefined',
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_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`;
         }
         if (args.options.teamId &&
@@ -110,6 +136,7 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
     });
 }, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
     this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-remove.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 _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators, _TeamsAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -48,7 +48,7 @@ class TeamsAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Teams app ${args.options.id || args.options.name} from the app catalog?` });
             if (result) {
                 await removeApp();
             }
@@ -75,7 +75,7 @@ class TeamsAppRemoveCommand extends GraphCommand {
         }
         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);
+            const result = await cli.handleMultipleResultsFound(`Multiple Teams apps with name '${options.name}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return app.id;

package/dist/m365/teams/commands/app/app-uninstall.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 _TeamsAppUninstallCommand_instances, _TeamsAppUninstallCommand_initTelemetry, _TeamsAppUninstallCommand_initOptions, _TeamsAppUninstallCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -45,7 +45,7 @@ class TeamsAppUninstallCommand extends GraphCommand {
             await uninstallApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?` });
             if (result) {
                 await uninstallApp();
             }

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

@@ -11,7 +11,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';
+import { cli } from '../../../../cli/cli.js';
 class TeamsAppUpdateCommand extends GraphCommand {
     get name() {
         return commands.APP_UPDATE;
@@ -66,7 +66,7 @@ class TeamsAppUpdateCommand extends GraphCommand {
         }
         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);
+            const result = await cli.handleMultipleResultsFound(`Multiple Teams apps with name ${options.name} found.`, resultAsKeyValuePair);
             return result.id;
         }
         return app.id;

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

@@ -8,7 +8,7 @@ import child_process from 'child_process';
 import fs from 'fs';
 import { homedir } from 'os';
 import util from 'util';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
@@ -36,7 +36,7 @@ class TeamsCacheRemoveCommand extends AnonymousCommand {
                 await logger.logToStderr('This command will execute the following steps.');
                 await logger.logToStderr('- Stop the Microsoft Teams client.');
                 await logger.logToStderr('- Clear the Microsoft Teams cached files.');
-                const result = await Cli.promptForConfirmation({ message: `Are you sure you want to clear your Microsoft Teams cache?` });
+                const result = await cli.promptForConfirmation({ message: `Are you sure you want to clear your Microsoft Teams cache?` });
                 if (result) {
                     await this.clearTeamsCache(logger);
                 }

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

@@ -8,7 +8,7 @@ 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 { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 class TeamsChannelAddCommand extends GraphCommand {
     get name() {
@@ -45,7 +45,7 @@ class TeamsChannelAddCommand extends GraphCommand {
         }
         if (matchingTeams.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams teams with name ${args.options.teamName} found.`, resultAsKeyValuePair);
+            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

@@ -10,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class TeamsChannelMemberAddCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_MEMBER_ADD;
@@ -116,7 +116,7 @@ class TeamsChannelMemberAddCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple users with display name '${userDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple users with display name '${userDisplayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return userItem.id;

package/dist/m365/teams/commands/channel/channel-member-remove.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 _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -47,7 +47,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
             const userName = args.options.userName || args.options.userId || args.options.id;
             const teamName = args.options.teamName || args.options.teamId;
             const channelName = args.options.channelName || args.options.channelId;
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?` });
             if (result) {
                 await removeMember();
             }
@@ -119,7 +119,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         }
         if (conversationMembers.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', conversationMembers);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams channel members with name ${args.options.userName} found.`, resultAsKeyValuePair);
+            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,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class TeamsChannelMemberSetCommand extends GraphCommand {
     get name() {
         return commands.CHANNEL_MEMBER_SET;
@@ -103,7 +103,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
         }
         if (conversationMembers.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', conversationMembers);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft Teams channel members with name ${args.options.userName} found.`, resultAsKeyValuePair);
+            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-remove.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 _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -53,7 +53,7 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         }
         else {
             const channel = args.options.name ? args.options.name : args.options.id;
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the channel ${channel} from team ${args.options.teamId || args.options.teamName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the channel ${channel} from team ${args.options.teamId || args.options.teamName}?` });
             if (result) {
                 await removeChannel();
             }

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

@@ -12,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class TeamsChatGetCommand extends GraphCommand {
     get name() {
         return commands.CHAT_GET;
@@ -67,7 +67,7 @@ class TeamsChatGetCommand extends GraphCommand {
             return existingChats[0].id;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
-        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with these participants found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple chat conversations with these participants found.`, resultAsKeyValuePair);
         return result.id;
     }
     async getChatIdByName(name) {
@@ -79,7 +79,7 @@ class TeamsChatGetCommand extends GraphCommand {
             return existingChats[0].id;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
-        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -8,7 +8,7 @@ import { odata } from '../../../../utils/odata.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 { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 class TeamsChatMemberRemoveCommand extends GraphCommand {
     get name() {
@@ -48,7 +48,7 @@ class TeamsChatMemberRemoveCommand extends GraphCommand {
             await removeUserFromChat();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove member ${args.options.id || args.options.userId || args.options.userName} from chat with id ${args.options.chatId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove member ${args.options.id || args.options.userId || args.options.userName} from chat with id ${args.options.chatId}?` });
             if (result) {
                 await removeUserFromChat();
             }

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -11,7 +11,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';
+import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 class TeamsChatMessageSendCommand extends GraphCommand {
     get name() {
@@ -57,7 +57,7 @@ class TeamsChatMessageSendCommand extends GraphCommand {
             return existingChats[0].id;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
-        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
         return result.id;
     }
     async getChatIdByName(chatName) {
@@ -69,7 +69,7 @@ class TeamsChatMessageSendCommand extends GraphCommand {
             return existingChats[0].id;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', existingChats);
-        const result = await Cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple chat conversations with this name found.`, resultAsKeyValuePair);
         return result.id;
     }
     // This Microsoft Graph API request throws an intermittent 404 exception, saying that it cannot find the principal.

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingAttendancereportListCommand_instances, _TeamsMeetingAttendancereportListCommand_initTelemetry, _TeamsMeetingAttendancereportListCommand_initOptions, _TeamsMeetingAttendancereportListCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -71,7 +71,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         return getUserOutput.id;
     }

package/dist/m365/teams/commands/tab/tab-remove.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 _TeamsTabRemoveCommand_instances, _TeamsTabRemoveCommand_initTelemetry, _TeamsTabRemoveCommand_initOptions, _TeamsTabRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -44,7 +44,7 @@ class TeamsTabRemoveCommand extends GraphCommand {
             await removeTab();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?` });
             if (result) {
                 await removeTab();
             }

package/dist/m365/teams/commands/team/team-app-list.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 _TeamsTeamAppListCommand_instances, _TeamsTeamAppListCommand_initTelemetry, _TeamsTeamAppListCommand_initOptions, _TeamsTeamAppListCommand_initValidators, _TeamsTeamAppListCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class TeamsTeamAppListCommand extends GraphCommand {
             }
             const teamId = await this.getTeamId(args);
             const res = await odata.getAllItems(`${this.resource}/v1.0/teams/${teamId}/installedApps?$expand=teamsApp,teamsAppDefinition`);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(res);
             }
             else {
@@ -62,7 +62,7 @@ class TeamsTeamAppListCommand extends GraphCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const commandOutput = await Cli.executeCommandWithOutput(teamGetCommand, { options: { ...teamGetOptions, _: [] } });
+        const commandOutput = await cli.executeCommandWithOutput(teamGetCommand, { options: { ...teamGetOptions, _: [] } });
         const team = JSON.parse(commandOutput.stdout);
         return team.id;
     }

package/dist/m365/teams/commands/team/team-remove.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 _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -57,7 +57,7 @@ class TeamsTeamRemoveCommand extends GraphCommand {
             await removeTeam();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?` });
             if (result) {
                 await removeTeam();
             }

package/dist/m365/teams/commands/user/user-app-add.js

@@ -3,8 +3,9 @@ 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 _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators;
+var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
 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';
@@ -18,13 +19,16 @@ class TeamsUserAppAddCommand extends GraphCommand {
     constructor() {
         super();
         _TeamsUserAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const userId = (args.options.userId ?? args.options.userName);
         const endpoint = `${this.resource}/v1.0`;
         const requestOptions = {
-            url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
+            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 'accept': 'application/json;odata.metadata=none'
@@ -42,22 +46,36 @@ class TeamsUserAppAddCommand extends GraphCommand {
         }
     }
 }
-_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
+_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--userId <userId>'
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (!validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     });
+}, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppAddCommand();
 //# sourceMappingURL=user-app-add.js.map

package/dist/m365/teams/commands/user/user-app-list.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 _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -36,7 +36,7 @@ class TeamsUserAppListCommand extends GraphCommand {
                 const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
                 i.appId = appId;
             });
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(items);
             }
             else {

package/dist/m365/teams/commands/user/user-app-remove.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 _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators, _TeamsUserAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -52,7 +52,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId ?? args.options.userName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId ?? args.options.userName}?` });
             if (result) {
                 await removeApp();
             }
@@ -77,7 +77,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
             throw `The specified Teams app does not exist`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-        const result = (await Cli.handleMultipleResultsFound(`Multiple Teams apps with name '${args.options.name}' found.`, resultAsKeyValuePair));
+        const result = (await cli.handleMultipleResultsFound(`Multiple Teams apps with name '${args.options.name}' found.`, resultAsKeyValuePair));
         return result.id;
     }
 }

package/dist/m365/tenant/commands/people/people-profilecardproperty-remove.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 _TenantPeopleProfileCardPropertyRemoveCommand_instances, _TenantPeopleProfileCardPropertyRemoveCommand_initTelemetry, _TenantPeopleProfileCardPropertyRemoveCommand_initOptions, _TenantPeopleProfileCardPropertyRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -47,7 +47,7 @@ class TenantPeopleProfileCardPropertyRemoveCommand extends GraphCommand {
             await removeProfileCardProperty();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the profile card property '${directoryPropertyName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the profile card property '${directoryPropertyName}'?` });
             if (result) {
                 await removeProfileCardProperty();
             }

package/dist/m365/todo/commands/list/list-remove.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 _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +27,7 @@ class TodoListRemoveCommand extends GraphCommand {
             await this.removeList(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?` });
             if (result) {
                 await this.removeList(args);
             }

package/dist/m365/todo/commands/task/task-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 _TodoTaskGetCommand_instances, _TodoTaskGetCommand_initTelemetry, _TodoTaskGetCommand_initOptions, _TodoTaskGetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -54,7 +54,7 @@ class TodoTaskGetCommand extends GraphCommand {
                 responseType: 'json'
             };
             const item = await request.get(requestOptions);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(item);
             }
             else {