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

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-restore.js

@@ -9,6 +9,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 AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_RESTORE;
@@ -69,7 +70,9 @@ class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
             throw `The specified group '${displayName || mailNickname}' does not exist.`;
         }
         if (groups.length > 1) {
-            throw `Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groups[0].id;
     }

package/dist/m365/aad/commands/m365group/m365group-remove.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadM365GroupRemoveCommand_instances, _AadM365GroupRemoveCommand_initTelemetry, _AadM365GroupRemoveCommand_initOptions, _AadM365GroupRemoveCommand_initValidators;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -29,6 +30,10 @@ class AadM365GroupRemoveCommand extends GraphCommand {
                 await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
             }
             try {
+                const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+                if (!isUnifiedGroup) {
+                    throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${args.options.id}`,
                     headers: {

package/dist/m365/aad/commands/m365group/m365group-renew.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadM365GroupRenewCommand_instances, _AadM365GroupRenewCommand_initOptions, _AadM365GroupRenewCommand_initValidators;
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -26,6 +27,10 @@ class AadM365GroupRenewCommand extends GraphCommand {
             await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
         }
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+            }
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
                 headers: {

package/dist/m365/aad/commands/m365group/m365group-set.js

@@ -11,6 +11,7 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 class AadM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
@@ -29,6 +30,10 @@ class AadM365GroupSetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+            }
             if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
                 if (this.verbose) {
                     await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);

package/dist/m365/aad/commands/m365group/m365group-teamify.js

@@ -4,7 +4,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupTeamifyCommand_instances, _AadM365GroupTeamifyCommand_initTelemetry, _AadM365GroupTeamifyCommand_initOptions, _AadM365GroupTeamifyCommand_initValidators, _AadM365GroupTeamifyCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 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';
@@ -24,12 +26,12 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
         __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initOptionSets).call(this);
     }
-    async getGroupId(args) {
-        if (args.options.id) {
-            return args.options.id;
+    async getGroupId(options) {
+        if (options.id) {
+            return options.id;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(args.options.mailNickname)}'`,
+            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(options.mailNickname)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -41,12 +43,19 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
             throw `The specified Microsoft 365 Group does not exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Microsoft 365 Groups with name ${args.options.mailNickname} found: ${response.value.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groupItem.id;
     }
     async commandAction(logger, args) {
         try {
+            const groupId = await this.getGroupId(args.options);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+            }
             const data = {
                 "memberSettings": {
                     "allowCreatePrivateChannels": true,
@@ -61,7 +70,6 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
                     "giphyContentRating": "strict"
                 }
             };
-            const groupId = await this.getGroupId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${formatting.encodeQueryParameter(groupId)}/team`,
                 headers: {

package/dist/m365/aad/commands/m365group/m365group-user-add.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadM365GroupUserAddCommand_instances, _AadM365GroupUserAddCommand_initTelemetry, _AadM365GroupUserAddCommand_initOptions, _AadM365GroupUserAddCommand_initValidators, _AadM365GroupUserAddCommand_initOptionSets;
 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';
@@ -31,6 +32,10 @@ class AadM365GroupUserAddCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(providedGroupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
+            }
             let requestOptions = {
                 url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
                 headers: {

package/dist/m365/aad/commands/m365group/m365group-user-list.js

@@ -8,6 +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 { aadGroup } from '../../../../utils/aadGroup.js';
 class AadM365GroupUserListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_LIST;
@@ -24,6 +25,10 @@ class AadM365GroupUserListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
+            }
             let users = await this.getOwners(args.options.groupId, logger);
             if (args.options.role !== 'Owner') {
                 const membersAndGuests = await this.getMembersAndGuests(args.options.groupId, logger);

package/dist/m365/aad/commands/m365group/m365group-user-remove.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 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';
@@ -33,6 +34,10 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = async () => {
             try {
+                const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+                if (!isUnifiedGroup) {
+                    throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+                }
                 // retrieve user
                 const user = await request.get({
                     url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,

package/dist/m365/aad/commands/m365group/m365group-user-set.js

@@ -10,6 +10,7 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 class AadM365GroupUserSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_SET;
@@ -31,6 +32,10 @@ class AadM365GroupUserSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+            }
             let users = await this.getOwners(groupId, logger);
             const membersAndGuests = await this.getMembersAndGuests(groupId, logger);
             users = users.concat(membersAndGuests);

package/dist/m365/aad/commands/sp/sp-add.js

@@ -9,6 +9,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 AadSpAddCommand extends GraphCommand {
     get name() {
         return commands.SP_ADD;
@@ -48,7 +49,9 @@ class AadSpAddCommand extends GraphCommand {
             throw `The specified Azure AD app doesn't exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Azure AD apps with name ${args.options.appName} found: ${response.value.map(x => x.appId)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            return result.appId;
         }
         return spItem.appId;
     }

package/dist/m365/aad/commands/sp/sp-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
+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 +49,9 @@ class AadSpGetCommand extends GraphCommand {
             throw `The specified Azure AD app does not exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return spItem.id;
     }

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

@@ -9,6 +9,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 AadUserGetCommand extends GraphCommand {
     get name() {
         return commands.USER_GET;
@@ -57,9 +58,13 @@ class AadUserGetCommand extends GraphCommand {
                 throw `The specified user with ${identifier} does not exist`;
             }
             if (res.value.length > 1) {
-                throw `Multiple users with ${identifier} found. Please disambiguate (user names): ${res.value.map(a => a.userPrincipalName).join(', ')} or (ids): ${res.value.map(a => a.id).join(', ')}`;
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+                const result = await Cli.handleMultipleResultsFound(`Multiple users with ${identifier} found.`, resultAsKeyValuePair);
+                await logger.log(result);
+            }
+            else {
+                await logger.log(res.value[0]);
             }
-            await logger.log(res.value[0]);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/aad/commands.js

@@ -13,6 +13,7 @@ export default {
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
+    GROUP_REMOVE: `${prefix} group remove`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

package/dist/m365/booking/commands/business/business-get.js

@@ -8,6 +8,7 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -60,7 +61,9 @@ class BookingBusinessGetCommand extends GraphCommand {
             throw `The specified business with name ${options.name} does not exist.`;
         }
         if (bookingBusinesses.length > 1) {
-            throw `Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', bookingBusinesses);
+            const result = await Cli.handleMultipleResultsFound(`Multiple businesses with name '${options.name}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return bookingBusinesses[0].id;
     }

package/dist/m365/commands/login.js

@@ -80,7 +80,7 @@ class LoginCommand extends Command {
                 throw new CommandError(error.message);
             }
             if (this.debug) {
-                await logger.logToStderr({
+                await logger.log({
                     connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
                     authType: AuthType[auth.service.authType],
                     appId: auth.service.appId,
@@ -90,7 +90,7 @@ class LoginCommand extends Command {
                 });
             }
             else {
-                await logger.logToStderr({
+                await logger.log({
                     connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
                     authType: AuthType[auth.service.authType],
                     appId: auth.service.appId,

package/dist/m365/flow/commands/flow-export.js

@@ -29,7 +29,7 @@ class FlowExportCommand extends PowerPlatformCommand {
         let filenameFromApi = '';
         const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.id}...`);
+            await logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.name}...`);
         }
         try {
             let res;
@@ -46,7 +46,7 @@ class FlowExportCommand extends PowerPlatformCommand {
                     },
                     data: {
                         "baseResourceIds": [
-                            `/providers/Microsoft.Flow/flows/${args.options.id}`
+                            `/providers/Microsoft.Flow/flows/${args.options.name}`
                         ]
                     },
                     responseType: 'json'
@@ -57,11 +57,11 @@ class FlowExportCommand extends PowerPlatformCommand {
                 throw res.errors[0].message;
             }
             if (this.verbose) {
-                await logger.logToStderr(`Initiating package export for Microsoft Flow ${args.options.id}...`);
+                await logger.logToStderr(`Initiating package export for Microsoft Flow ${args.options.name}...`);
             }
             let requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.id)}?api-version=2016-11-01`
+                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
                     : `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
@@ -78,7 +78,7 @@ class FlowExportCommand extends PowerPlatformCommand {
                 });
                 requestOptions['data'] = {
                     "includedResourceIds": [
-                        `/providers/Microsoft.Flow/flows/${args.options.id}`
+                        `/providers/Microsoft.Flow/flows/${args.options.name}`
                     ],
                     "details": {
                         "displayName": args.options.packageDisplayName,
@@ -91,7 +91,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             }
             res = formatArgument === 'json' ? await request.get(requestOptions) : await request.post(requestOptions);
             if (this.verbose) {
-                await logger.logToStderr(`Getting file for Microsoft Flow ${args.options.id}...`);
+                await logger.logToStderr(`Getting file for Microsoft Flow ${args.options.name}...`);
             }
             const downloadFileUrl = formatArgument === 'json' ? '' : res.packageLink.value;
             const filenameRegEx = /([^\/]+\.zip)/i;
@@ -105,7 +105,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             }
             requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
+                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
                     : downloadFileUrl,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
                 // to utf8 and binary data is corrupt
@@ -149,27 +149,27 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
     });
 }, _FlowExportCommand_initOptions = function _FlowExportCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-n, --name <name>'
     }, {
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-n, --packageDisplayName [packageDisplayName]'
+        option: '-d, --packageDisplayName [packageDisplayName]'
     }, {
-        option: '-d, --packageDescription [packageDescription]'
+        option: '--packageDescription [packageDescription]'
     }, {
         option: '-c, --packageCreatedBy [packageCreatedBy]'
     }, {
         option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
     }, {
-        option: '--format [format]'
+        option: '-f, --format [format]'
     }, {
         option: '-p, --path [path]'
     });
 }, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
     this.validators.push(async (args) => {
         const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.name)) {
+            return `${args.options.name} is not a valid GUID`;
         }
         if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {
             return 'Option format must be json or zip. Default is zip';

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -43,7 +43,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         const data = {
-            changeType: args.options.changeType,
+            changeType: args.options.changeTypes,
             resource: args.options.resource,
             notificationUrl: args.options.notificationUrl,
             expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args)
@@ -121,7 +121,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
 _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCommand_initTelemetry = function _GraphSubscriptionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            changeType: args.options.changeType,
+            changeTypes: args.options.changeTypes,
             expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
             clientState: typeof args.options.clientState !== 'undefined'
         });
@@ -132,7 +132,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
     }, {
         option: '-u, --notificationUrl <notificationUrl>'
     }, {
-        option: '-c, --changeType <changeType>',
+        option: '-c, --changeTypes <changeTypes>',
         autocomplete: ['created', 'updated', 'deleted']
     }, {
         option: '-e, --expirationDateTime [expirationDateTime]'
@@ -144,8 +144,8 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.notificationUrl.indexOf('https://') !== 0) {
             return `The specified notification URL '${args.options.notificationUrl}' does not start with 'https://'`;
         }
-        if (!this.isValidChangeTypes(args.options.changeType)) {
-            return `The specified changeType is invalid. Valid options are 'created', 'updated' and 'deleted'`;
+        if (!this.isValidChangeTypes(args.options.changeTypes)) {
+            return `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`;
         }
         if (args.options.expirationDateTime && !validation.isValidISODateTime(args.options.expirationDateTime)) {
             return 'The expirationDateTime is not a valid ISO date string';

package/dist/m365/outlook/commands/message/message-list.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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
-import os from 'os';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
+import { Cli } from '../../../../cli/Cli.js';
 class OutlookMessageListCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_LIST;
@@ -61,7 +61,9 @@ class OutlookMessageListCommand extends GraphCommand {
             throw `Folder with name '${args.options.folderName}' not found`;
         }
         if (response.value.length > 1) {
-            throw `Multiple folders with name '${args.options.folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple folders with name '${args.options.folderName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return response.value[0].id;
     }

package/dist/m365/outlook/commands/message/message-move.js

@@ -4,12 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
-import os from 'os';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
+import { Cli } from '../../../../cli/Cli.js';
 class OutlookMessageMoveCommand extends GraphCommand {
     get name() {
         return commands.MESSAGE_MOVE;
@@ -66,7 +66,9 @@ class OutlookMessageMoveCommand extends GraphCommand {
             throw `Folder with name '${folderName}' not found`;
         }
         if (response.value.length > 1) {
-            throw `Multiple folders with name '${folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple folders with name '${folderName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return response.value[0].id;
     }

package/dist/m365/pa/commands/app/app-export.js

@@ -69,7 +69,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             },
             data: {
                 baseResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ]
             },
             responseType: 'json'
@@ -82,7 +82,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
     }
     async exportPackage(args, logger) {
         if (this.verbose) {
-            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.id}...`);
+            await logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.name}...`);
         }
         const resources = await this.getPackageResources(args, logger);
         const requestOptions = {
@@ -93,7 +93,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
             responseType: 'json',
             data: {
                 includedResourceIds: [
-                    `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    `/providers/Microsoft.PowerApps/apps/${args.options.name}`
                 ],
                 details: {
                     creator: args.options.packageCreatedBy,
@@ -148,11 +148,11 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-n, --name <name>'
     }, {
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-n, --packageDisplayName [packageDisplayName]'
+        option: '--packageDisplayName [packageDisplayName]'
     }, {
         option: '-d, --packageDescription [packageDescription]'
     }, {
@@ -164,8 +164,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
     });
 }, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.name)) {
+            return `${args.options.name} is not a valid GUID for option name`;
         }
         if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
             return 'Specified path where to save the file does not exist';

package/dist/m365/pa/commands/connector/connector-export.js

@@ -29,9 +29,9 @@ class PaConnectorExportCommand extends PowerAppsCommand {
         __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.name);
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${formatting.encodeQueryParameter(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$filter=environment%20eq%20%27${formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
             headers: {
                 accept: 'application/json'
             },
@@ -53,7 +53,7 @@ class PaConnectorExportCommand extends PowerAppsCommand {
             const settings = {
                 apiDefinition: "apiDefinition.swagger.json",
                 apiProperties: "apiProperties.json",
-                connectorId: args.options.connector,
+                connectorId: args.options.name,
                 environment: args.options.environmentName,
                 icon: "icon.png",
                 powerAppsApiVersion: "2016-11-01",
@@ -157,7 +157,7 @@ _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_i
     this.options.unshift({
         option: '-e, --environmentName <environmentName>'
     }, {
-        option: '-c, --connector <connector>'
+        option: '-n, --name <name>'
     }, {
         option: '--outputFolder [outputFolder]'
     });
@@ -167,7 +167,7 @@ _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_i
             !fs.existsSync(path.resolve(args.options.outputFolder))) {
             return `Specified output folder ${args.options.outputFolder} doesn't exist`;
         }
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.name);
         if (fs.existsSync(outputFolder)) {
             return `Connector output folder ${outputFolder} already exists`;
         }

package/dist/m365/planner/commands/bucket/bucket-add.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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets;
+var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets, _PlannerBucketAddCommand_initTypes;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { planner } from '../../../../utils/planner.js';
@@ -27,6 +27,7 @@ class PlannerBucketAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -109,6 +110,8 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => args.options.planTitle !== undefined
     });
+}, _PlannerBucketAddCommand_initTypes = function _PlannerBucketAddCommand_initTypes() {
+    this.types.string.push('name', 'planId', 'planTitle', 'ownerGroupId', 'ownerGroupName', 'orderHint', 'rosterId ');
 };
 export default new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map