@pnp/cli-microsoft365 7.0.0-beta.093ef31 → 7.0.0-beta.14c7857

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

package/dist/m365/teams/commands/chat/chat-message-send.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 _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
-import os from 'os';
 import auth from '../../../../Auth.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
@@ -12,6 +11,8 @@ 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 { formatting } from '../../../../utils/formatting.js';
 class TeamsChatMessageSendCommand extends GraphCommand {
     get name() {
         return commands.CHAT_MESSAGE_SEND;
@@ -55,10 +56,9 @@ class TeamsChatMessageSendCommand 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 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;
     }
     async getChatIdByName(chatName) {
         const existingChats = await chatUtil.findExistingGroupChatsByName(chatName);
@@ -68,11 +68,9 @@ class TeamsChatMessageSendCommand 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;
     }
     // This Microsoft Graph API request throws an intermittent 404 exception, saying that it cannot find the principal.
     // The same behavior occurs when creating the conversation through the Graph Explorer.

package/dist/m365/teams/commands/team/team-clone.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 _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators, _TeamsTeamCloneCommand_initOptionSets;
+var _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -22,7 +22,6 @@ class TeamsTeamCloneCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamCloneCommand_instances, "m", _TeamsTeamCloneCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const data = {
@@ -42,7 +41,7 @@ class TeamsTeamCloneCommand extends GraphCommand {
         const requestOptions = {
             url: `${this.resource}/v1.0/teams/${formatting.encodeQueryParameter(args.options.id)}/clone`,
             headers: {
-                "content-type": "application/json",
+                'content-type': 'application/json',
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
@@ -75,16 +74,14 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.description !== 'undefined',
             classification: typeof args.options.classification !== 'undefined',
-            visibility: typeof args.options.visibility !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
+            visibility: typeof args.options.visibility !== 'undefined'
         });
     });
 }, _TeamsTeamCloneCommand_initOptions = function _TeamsTeamCloneCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id [id]'
+        option: '-i, --id <id>'
     }, {
-        option: '-n, --name [name]'
+        option: '-n, --name <name>'
     }, {
         option: '-p, --partsToClone <partsToClone>',
         autocomplete: ['apps', 'channels', 'members', 'settings', 'tabs']
@@ -121,8 +118,6 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
         }
         return true;
     });
-}, _TeamsTeamCloneCommand_initOptionSets = function _TeamsTeamCloneCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsTeamCloneCommand();
 //# sourceMappingURL=team-clone.js.map

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

@@ -3,11 +3,13 @@ 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 _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
+var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions, _TeamsTeamListCommand_initValidators, _TeamsTeamListCommand_initOptionSets, _TeamsTeamListCommand_initTypes;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsTeamListCommand extends GraphCommand {
     get name() {
         return commands.TEAM_LIST;
@@ -23,64 +25,126 @@ class TeamsTeamListCommand extends GraphCommand {
         _TeamsTeamListCommand_instances.add(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        let endpoint = `${this.resource}/v1.0/groups?$select=id,displayName,description,resourceProvisioningOptions`;
-        if (args.options.joined) {
-            endpoint = `${this.resource}/v1.0/me/joinedTeams`;
+        if (this.verbose) {
+            if (!args.options.joined && !args.options.associated) {
+                await logger.logToStderr(`Retrieving Microsoft Teams in the tenant...`);
+            }
+            else {
+                const user = args.options.userId || args.options.userName || 'me';
+                await logger.logToStderr(`Retrieving Microsoft Teams ${args.options.joined ? 'joined by' : 'associated with'} ${user}...`);
+            }
         }
         try {
-            const items = await odata.getAllItems(endpoint);
-            if (args.options.joined) {
-                await logger.log(items);
+            let endpoint = `${this.resource}/v1.0`;
+            if (args.options.joined || args.options.associated) {
+                endpoint += args.options.userId || args.options.userName ? `/users/${args.options.userId || formatting.encodeQueryParameter(args.options.userName)}` : '/me';
+                endpoint += args.options.joined ? '/joinedTeams' : '/teamwork/associatedTeams';
+                endpoint += '?$select=id';
             }
             else {
-                const teamItems = await Promise.all(items.filter((e) => {
-                    return e.resourceProvisioningOptions.indexOf('Team') > -1;
-                }).map(g => this.getTeamFromGroup(g)));
-                await logger.log(teamItems);
+                // Get all team groups within the tenant
+                endpoint += `/groups?$select=id&$filter=resourceProvisioningOptions/Any(x:x eq 'Team')`;
             }
+            const groupResponse = await odata.getAllItems(endpoint);
+            const groupIds = groupResponse.map(g => g.id);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieved ${groupIds.length} Microsoft Teams, getting additional information...`);
+            }
+            let teams = await this.getAllTeams(groupIds);
+            // Sort teams by display name
+            teams = teams.sort((x, y) => x.displayName.localeCompare(y.displayName));
+            await logger.log(teams);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getTeamFromGroup(group) {
+    async getAllTeams(groupIds) {
+        const groupBatches = [];
+        for (let i = 0; groupIds.length > i; i += 20) {
+            groupBatches.push(groupIds.slice(i, i + 20));
+        }
+        const promises = groupBatches.map(g => this.getTeamsBatch(g));
+        const teams = await Promise.all(promises);
+        const result = teams.reduce((prev, val) => prev.concat(val), []);
+        return result;
+    }
+    async getTeamsBatch(groupIds) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${group.id}`,
+            url: `${this.resource}/v1.0/$batch`,
             headers: {
-                accept: 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
             },
-            responseType: 'json'
-        };
-        try {
-            return await request.get(requestOptions);
-        }
-        catch (err) {
-            if (err.statusCode === 403) {
-                return {
-                    id: group.id,
-                    displayName: group.displayName,
-                    description: group.description,
-                    isArchived: undefined
-                };
+            responseType: 'json',
+            data: {
+                requests: groupIds.map((id, index) => ({
+                    id: index.toString(),
+                    method: 'GET',
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    url: `/teams/${id}`
+                }))
             }
-            else {
-                throw err;
+        };
+        const response = await request.post(requestOptions);
+        // Throw error if any of the requests failed
+        for (const item of response.responses) {
+            if (item.status !== 200) {
+                throw item.body;
             }
         }
+        return response.responses.map(r => r.body);
     }
 }
 _TeamsTeamListCommand_instances = new WeakSet(), _TeamsTeamListCommand_initTelemetry = function _TeamsTeamListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            joined: !!args.options.joined,
+            associated: !!args.options.associated,
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsTeamListCommand_initOptions = function _TeamsTeamListCommand_initOptions() {
     this.options.unshift({
         option: '-j, --joined'
+    }, {
+        option: '-a, --associated'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsTeamListCommand_initValidators = function _TeamsTeamListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userId} is not a valid UPN for userName.`;
+        }
+        if ((args.options.userId || args.options.userName) && !args.options.joined && !args.options.associated) {
+            return 'You must specify either joined or associated when specifying userId or userName.';
+        }
+        return true;
+    });
+}, _TeamsTeamListCommand_initOptionSets = function _TeamsTeamListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['joined', 'associated'],
+        runsWhen: (args) => !!args.options.joined || !!args.options.associated
+    }, {
+        options: ['userId', 'userName'],
+        runsWhen: (args) => typeof args.options.userId !== 'undefined' || typeof args.options.userName !== 'undefined'
     });
+}, _TeamsTeamListCommand_initTypes = function _TeamsTeamListCommand_initTypes() {
+    this.types.string.push('userId', 'userName');
 };
 export default new TeamsTeamListCommand();
 //# sourceMappingURL=team-list.js.map

package/dist/m365/tenant/commands/info/info-get.js

@@ -0,0 +1,83 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TenantInfoGetCommand_instances, _TenantInfoGetCommand_initTelemetry, _TenantInfoGetCommand_initOptions, _TenantInfoGetCommand_initValidators;
+import auth from '../../../../Auth.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
+import commands from '../../commands.js';
+class TenantInfoGetCommand extends GraphCommand {
+    get name() {
+        return commands.INFO_GET;
+    }
+    get description() {
+        return 'Gets information about any tenant';
+    }
+    constructor() {
+        super();
+        _TenantInfoGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        let domainName = args.options.domainName;
+        const tenantId = args.options.tenantId;
+        if (!domainName && !tenantId) {
+            const userName = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            domainName = userName.split('@')[1];
+        }
+        let requestUrl = `${this.resource}/v1.0/tenantRelationships/`;
+        if (tenantId) {
+            requestUrl += `findTenantInformationByTenantId(tenantId='${formatting.encodeQueryParameter(tenantId)}')`;
+        }
+        else {
+            requestUrl += `findTenantInformationByDomainName(domainName='${formatting.encodeQueryParameter(domainName)}')`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            const res = await request.get(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_TenantInfoGetCommand_instances = new WeakSet(), _TenantInfoGetCommand_initTelemetry = function _TenantInfoGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            domainName: typeof args.options.domainName !== 'undefined',
+            tenantId: typeof args.options.tenantId !== 'undefined'
+        });
+    });
+}, _TenantInfoGetCommand_initOptions = function _TenantInfoGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-d, --domainName [domainName]'
+    }, {
+        option: '-i, --tenantId [tenantId]'
+    });
+}, _TenantInfoGetCommand_initValidators = function _TenantInfoGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.tenantId && !validation.isValidGuid(args.options.tenantId)) {
+            return `${args.options.tenantId} is not a valid GUID`;
+        }
+        if (args.options.tenantId && args.options.domainName) {
+            return `Specify either domainName or tenantId but not both`;
+        }
+        return true;
+    });
+};
+export default new TenantInfoGetCommand();
+//# sourceMappingURL=info-get.js.map