@pnp/cli-microsoft365 7.0.0-beta.7f98bac → 7.0.0-beta.8726fe8

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/funsettings/funsettings-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsFunSettingsSetCommand_instances, _TeamsFunSettingsSetCommand_initTelemetry, _TeamsFunSettingsSetCommand_initOptions, _TeamsFunSettingsSetCommand_initTypes, _TeamsFunSettingsSetCommand_initValidators;
+var _TeamsFunSettingsSetCommand_instances, _a, _TeamsFunSettingsSetCommand_initTelemetry, _TeamsFunSettingsSetCommand_initOptions, _TeamsFunSettingsSetCommand_initTypes, _TeamsFunSettingsSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -32,7 +32,7 @@ class TeamsFunSettingsSetCommand extends GraphCommand {
             const data = {
                 funSettings: {}
             };
-            TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
+            _a.booleanProps.forEach(p => {
                 if (typeof args.options[p] !== 'undefined') {
                     data.funSettings[p] = args.options[p];
                 }
@@ -55,12 +55,12 @@ class TeamsFunSettingsSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsFunSettingsSetCommand_instances = new WeakSet(), _TeamsFunSettingsSetCommand_initTelemetry = function _TeamsFunSettingsSetCommand_initTelemetry() {
+_a = TeamsFunSettingsSetCommand, _TeamsFunSettingsSetCommand_instances = new WeakSet(), _TeamsFunSettingsSetCommand_initTelemetry = function _TeamsFunSettingsSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             giphyContentRating: args.options.giphyContentRating
         });
-        TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
+        _a.booleanProps.forEach(p => {
             this.telemetryProperties[p] = args.options[p];
         });
     });

package/dist/m365/teams/commands/guestsettings/guestsettings-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsGuestSettingsSetCommand_instances, _TeamsGuestSettingsSetCommand_initTelemetry, _TeamsGuestSettingsSetCommand_initOptions, _TeamsGuestSettingsSetCommand_initTypes, _TeamsGuestSettingsSetCommand_initValidators;
+var _TeamsGuestSettingsSetCommand_instances, _a, _TeamsGuestSettingsSetCommand_initTelemetry, _TeamsGuestSettingsSetCommand_initOptions, _TeamsGuestSettingsSetCommand_initTypes, _TeamsGuestSettingsSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -28,7 +28,7 @@ class TeamsGuestSettingsSetCommand extends GraphCommand {
         const data = {
             guestSettings: {}
         };
-        TeamsGuestSettingsSetCommand.booleanProps.forEach(p => {
+        _a.booleanProps.forEach(p => {
             if (typeof args.options[p] !== 'undefined') {
                 data.guestSettings[p] = args.options[p];
             }
@@ -49,9 +49,9 @@ class TeamsGuestSettingsSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsGuestSettingsSetCommand_instances = new WeakSet(), _TeamsGuestSettingsSetCommand_initTelemetry = function _TeamsGuestSettingsSetCommand_initTelemetry() {
+_a = TeamsGuestSettingsSetCommand, _TeamsGuestSettingsSetCommand_instances = new WeakSet(), _TeamsGuestSettingsSetCommand_initTelemetry = function _TeamsGuestSettingsSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        TeamsGuestSettingsSetCommand.booleanProps.forEach(p => {
+        _a.booleanProps.forEach(p => {
             this.telemetryProperties[p] = args.options[p];
         });
     });

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

@@ -5,13 +5,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingListCommand_instances, _TeamsMeetingListCommand_initTelemetry, _TeamsMeetingListCommand_initOptions, _TeamsMeetingListCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { Cli } from '../../../../cli/Cli.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsMeetingListCommand extends GraphCommand {
     get name() {
         return commands.MEETING_LIST;
@@ -20,7 +21,7 @@ class TeamsMeetingListCommand extends GraphCommand {
         return 'Retrieve all online meetings for a given user or shared mailbox';
     }
     defaultProperties() {
-        return ['subject', 'start', 'end'];
+        return ['subject', 'startDateTime', 'endDateTime'];
     }
     constructor() {
         super();
@@ -32,59 +33,99 @@ class TeamsMeetingListCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
-            if (this.verbose) {
-                await logger.logToStderr(`Retrieving meetings for ${isAppOnlyAccessToken ? 'specific user' : 'currently logged in user'}`);
-            }
-            let requestUrl = `${this.resource}/v1.0/`;
-            if (isAppOnlyAccessToken) {
-                if (!args.options.userId && !args.options.userName && !args.options.email) {
-                    throw `The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`;
-                }
-                requestUrl += 'users/';
-                if (args.options.userId) {
-                    requestUrl += args.options.userId;
-                }
-                else if (args.options.userName) {
-                    requestUrl += args.options.userName;
-                }
-                else if (args.options.email) {
-                    const userId = await aadUser.getUserIdByEmail(args.options.email);
-                    requestUrl += userId;
-                }
-            }
-            else {
-                if (args.options.userId || args.options.userName || args.options.email) {
-                    throw `The options 'userId', 'userName' and 'email' cannot be used when retrieving meetings using delegated permissions`;
-                }
-                requestUrl += `me`;
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName && !args.options.email) {
+                throw `The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`;
             }
-            requestUrl += `/events?$filter=start/dateTime ge '${args.options.startDateTime}'`;
-            if (args.options.endDateTime) {
-                requestUrl += ` and end/dateTime le '${args.options.endDateTime}'`;
+            else if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName || args.options.email)) {
+                throw `The options 'userId', 'userName' and 'email' cannot be used when retrieving meetings using delegated permissions`;
             }
-            if (args.options.isOrganizer) {
-                requestUrl += ' and isOrganizer eq true';
-            }
-            const res = await odata.getAllItems(requestUrl);
-            const resFiltered = res.filter(y => y.isOnlineMeeting);
-            if (!args.options.output || !Cli.shouldTrimOutput(args.options.output)) {
-                await logger.log(resFiltered);
-            }
-            else {
-                //converted to text friendly output
-                await logger.log(resFiltered.map(i => {
-                    return {
-                        subject: i.subject,
-                        start: i.start.dateTime,
-                        end: i.end.dateTime
-                    };
-                }));
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving meetings for user: ${args.options.userId || args.options.userName || args.options.email || accessToken.getUserNameFromAccessToken(auth.service.accessTokens[this.resource].accessToken)}...`);
             }
+            const graphBaseUrl = await this.getGraphBaseUrl(args.options);
+            const meetingUrls = await this.getMeetingJoinUrls(graphBaseUrl, args.options);
+            const meetings = await this.getTeamsMeetings(logger, graphBaseUrl, meetingUrls);
+            await logger.log(meetings);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    /**
+     * Get the first part of the Graph API URL that contains the user information.
+     */
+    async getGraphBaseUrl(options) {
+        let requestUrl = `${this.resource}/v1.0/`;
+        if (options.userId || options.userName) {
+            requestUrl += `users/${options.userId || options.userName}`;
+        }
+        else if (options.email) {
+            const userId = await aadUser.getUserIdByEmail(options.email);
+            requestUrl += `users/${userId}`;
+        }
+        else {
+            requestUrl += 'me';
+        }
+        return requestUrl;
+    }
+    /**
+     * Gets the meeting join urls for the specified user using calendar events.
+     */
+    async getMeetingJoinUrls(graphBaseUrl, options) {
+        let requestUrl = graphBaseUrl;
+        requestUrl += `/events?$filter=start/dateTime ge '${options.startDateTime}'`;
+        if (options.endDateTime) {
+            requestUrl += ` and end/dateTime lt '${options.endDateTime}'`;
+        }
+        if (options.isOrganizer) {
+            requestUrl += ' and isOrganizer eq true';
+        }
+        requestUrl += '&$select=onlineMeeting';
+        const items = await odata.getAllItems(requestUrl);
+        const result = items.filter(i => i.onlineMeeting).map(i => i.onlineMeeting.joinUrl);
+        return result;
+    }
+    async getTeamsMeetings(logger, graphBaseUrl, meetingUrls) {
+        const graphRelativeUrl = graphBaseUrl.replace(`${this.resource}/v1.0/`, '');
+        let result = [];
+        for (let i = 0; i < meetingUrls.length; i += 20) {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving meetings ${i + 1}-${Math.min(i + 20, meetingUrls.length)}...`);
+            }
+            const batch = meetingUrls.slice(i, i + 20);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    requests: batch.map((url, index) => ({
+                        id: i + index,
+                        method: 'GET',
+                        url: `${graphRelativeUrl}/onlineMeetings?$filter=joinWebUrl eq '${formatting.encodeQueryParameter(url)}'`
+                    }))
+                }
+            };
+            const requestResponse = await request.post(requestOptions);
+            for (const response of requestResponse.responses) {
+                if (response.status === 200) {
+                    result.push(response.body.value[0]);
+                }
+                else {
+                    // Encountered errors where message was empty resulting in [object Object] error messages
+                    if (!response.body.error.message) {
+                        throw response.body.error.code;
+                    }
+                    throw response.body;
+                }
+            }
+        }
+        // Sort all meetings by start date
+        result = result.sort((a, b) => a.startDateTime < b.startDateTime ? -1 : a.startDateTime > b.startDateTime ? 1 : 0);
+        return result;
+    }
 }
 _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -113,13 +154,22 @@ _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_ini
 }, _TeamsMeetingListCommand_initValidators = function _TeamsMeetingListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidISODateTime(args.options.startDateTime)) {
-            return `'${args.options.startDateTime}' is not a valid ISO date string`;
+            return `'${args.options.startDateTime}' is not a valid ISO date string for startDateTime.`;
+        }
+        if (args.options.endDateTime && !validation.isValidISODateTime(args.options.endDateTime)) {
+            return `'${args.options.startDateTime}' is not a valid ISO date string for endDateTime.`;
+        }
+        if (args.options.startDateTime && args.options.endDateTime && args.options.startDateTime > args.options.endDateTime) {
+            return 'startDateTime value must be before endDateTime.';
         }
         if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid Guid`;
+            return `${args.options.userId} is not a valid GUID for userId.`;
         }
-        if (args.options.endDateTime && !validation.isValidISODateTime(args.options.endDateTime)) {
-            return `'${args.options.startDateTime}' is not a valid ISO date string`;
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `'${args.options.userName}' is not a valid UPN for userName.`;
+        }
+        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
+            return `'${args.options.email}' is not a valid UPN for email.`;
         }
         return true;
     });

package/dist/m365/teams/commands/membersettings/membersettings-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsMemberSettingsSetCommand_instances, _TeamsMemberSettingsSetCommand_initTelemetry, _TeamsMemberSettingsSetCommand_initOptions, _TeamsMemberSettingsSetCommand_initTypes, _TeamsMemberSettingsSetCommand_initValidators;
+var _TeamsMemberSettingsSetCommand_instances, _a, _TeamsMemberSettingsSetCommand_initTelemetry, _TeamsMemberSettingsSetCommand_initOptions, _TeamsMemberSettingsSetCommand_initTypes, _TeamsMemberSettingsSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -28,7 +28,7 @@ class TeamsMemberSettingsSetCommand extends GraphCommand {
         const data = {
             memberSettings: {}
         };
-        TeamsMemberSettingsSetCommand.booleanProps.forEach(p => {
+        _a.booleanProps.forEach(p => {
             if (typeof args.options[p] !== 'undefined') {
                 data.memberSettings[p] = args.options[p];
             }
@@ -49,9 +49,9 @@ class TeamsMemberSettingsSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsMemberSettingsSetCommand_instances = new WeakSet(), _TeamsMemberSettingsSetCommand_initTelemetry = function _TeamsMemberSettingsSetCommand_initTelemetry() {
+_a = TeamsMemberSettingsSetCommand, _TeamsMemberSettingsSetCommand_instances = new WeakSet(), _TeamsMemberSettingsSetCommand_initTelemetry = function _TeamsMemberSettingsSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        TeamsMemberSettingsSetCommand.booleanProps.forEach(p => {
+        _a.booleanProps.forEach(p => {
             this.telemetryProperties[p] = args.options[p];
         });
     });

package/dist/m365/teams/commands/messagingsettings/messagingsettings-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsMessagingSettingsSetCommand_instances, _TeamsMessagingSettingsSetCommand_initTelemetry, _TeamsMessagingSettingsSetCommand_initOptions, _TeamsMessagingSettingsSetCommand_initTypes, _TeamsMessagingSettingsSetCommand_initValidators;
+var _TeamsMessagingSettingsSetCommand_instances, _a, _TeamsMessagingSettingsSetCommand_initTelemetry, _TeamsMessagingSettingsSetCommand_initOptions, _TeamsMessagingSettingsSetCommand_initTypes, _TeamsMessagingSettingsSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -28,7 +28,7 @@ class TeamsMessagingSettingsSetCommand extends GraphCommand {
         const data = {
             messagingSettings: {}
         };
-        TeamsMessagingSettingsSetCommand.booleanProps.forEach((p) => {
+        _a.booleanProps.forEach((p) => {
             if (typeof args.options[p] !== 'undefined') {
                 data.messagingSettings[p] = args.options[p];
             }
@@ -49,9 +49,9 @@ class TeamsMessagingSettingsSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsMessagingSettingsSetCommand_instances = new WeakSet(), _TeamsMessagingSettingsSetCommand_initTelemetry = function _TeamsMessagingSettingsSetCommand_initTelemetry() {
+_a = TeamsMessagingSettingsSetCommand, _TeamsMessagingSettingsSetCommand_instances = new WeakSet(), _TeamsMessagingSettingsSetCommand_initTelemetry = function _TeamsMessagingSettingsSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        TeamsMessagingSettingsSetCommand.booleanProps.forEach((p) => {
+        _a.booleanProps.forEach((p) => {
             this.telemetryProperties[p] = args.options[p];
         });
     });
@@ -83,7 +83,7 @@ _TeamsMessagingSettingsSetCommand_instances = new WeakSet(), _TeamsMessagingSett
         }
         let hasDuplicate = false;
         let property = '';
-        TeamsMessagingSettingsSetCommand.booleanProps.forEach((prop) => {
+        _a.booleanProps.forEach((prop) => {
             if (args.options[prop] instanceof Array) {
                 property = prop;
                 hasDuplicate = true;

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/teams/commands/team/team-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
+var _TeamsTeamSetCommand_instances, _a, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -60,9 +60,9 @@ class TeamsTeamSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
+_a = TeamsTeamSetCommand, _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        TeamsTeamSetCommand.props.forEach((p) => {
+        _a.props.forEach((p) => {
             this.telemetryProperties[p] = typeof args.options[p] !== 'undefined';
         });
     });