@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

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`,
@@ -21,28 +22,28 @@ export default {
     GROUPSETTINGTEMPLATE_GET: `${prefix} groupsettingtemplate get`,
     GROUPSETTINGTEMPLATE_LIST: `${prefix} groupsettingtemplate list`,
     LICENSE_LIST: `${prefix} license list`,
-    O365GROUP_ADD: `${prefix} o365group add`,
-    O365GROUP_GET: `${prefix} o365group get`,
-    O365GROUP_LIST: `${prefix} o365group list`,
-    O365GROUP_CONVERSATION_LIST: `${prefix} o365group conversation list`,
-    O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
-    O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
-    O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
-    O365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} o365group recyclebinitem remove`,
-    O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
-    O365GROUP_SET: `${prefix} o365group set`,
-    O365GROUP_TEAMIFY: `${prefix} o365group teamify`,
-    O365GROUP_REMOVE: `${prefix} o365group remove`,
-    O365GROUP_RENEW: `${prefix} o365group renew`,
-    O365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} o365group report activitycounts`,
-    O365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} o365group report activitydetail`,
-    O365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} o365group report activityfilecounts`,
-    O365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} o365group report activitygroupcounts`,
-    O365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} o365group report activitystorage`,
-    O365GROUP_USER_ADD: `${prefix} o365group user add`,
-    O365GROUP_USER_LIST: `${prefix} o365group user list`,
-    O365GROUP_USER_REMOVE: `${prefix} o365group user remove`,
-    O365GROUP_USER_SET: `${prefix} o365group user set`,
+    M365GROUP_ADD: `${prefix} m365group add`,
+    M365GROUP_GET: `${prefix} m365group get`,
+    M365GROUP_LIST: `${prefix} m365group list`,
+    M365GROUP_CONVERSATION_LIST: `${prefix} m365group conversation list`,
+    M365GROUP_CONVERSATION_POST_LIST: `${prefix} m365group conversation post list`,
+    M365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} m365group recyclebinitem clear`,
+    M365GROUP_RECYCLEBINITEM_LIST: `${prefix} m365group recyclebinitem list`,
+    M365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} m365group recyclebinitem remove`,
+    M365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} m365group recyclebinitem restore`,
+    M365GROUP_SET: `${prefix} m365group set`,
+    M365GROUP_TEAMIFY: `${prefix} m365group teamify`,
+    M365GROUP_REMOVE: `${prefix} m365group remove`,
+    M365GROUP_RENEW: `${prefix} m365group renew`,
+    M365GROUP_REPORT_ACTIVITYCOUNTS: `${prefix} m365group report activitycounts`,
+    M365GROUP_REPORT_ACTIVITYDETAIL: `${prefix} m365group report activitydetail`,
+    M365GROUP_REPORT_ACTIVITYFILECOUNTS: `${prefix} m365group report activityfilecounts`,
+    M365GROUP_REPORT_ACTIVITYGROUPCOUNTS: `${prefix} m365group report activitygroupcounts`,
+    M365GROUP_REPORT_ACTIVITYSTORAGE: `${prefix} m365group report activitystorage`,
+    M365GROUP_USER_ADD: `${prefix} m365group user add`,
+    M365GROUP_USER_LIST: `${prefix} m365group user list`,
+    M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
+    M365GROUP_USER_SET: `${prefix} m365group user set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

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/cli/commands/cli-issue.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 _CliIssueCommand_instances, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
+var _CliIssueCommand_instances, _a, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
@@ -38,7 +38,7 @@ class CliIssueCommand extends AnonymousCommand {
         await logger.log(issueLink);
     }
 }
-_CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
+_a = CliIssueCommand, _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             type: args.options.type
@@ -47,12 +47,12 @@ _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = fun
 }, _CliIssueCommand_initOptions = function _CliIssueCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type <type>',
-        autocomplete: CliIssueCommand.issueType
+        autocomplete: _a.issueType
     });
 }, _CliIssueCommand_initValidators = function _CliIssueCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliIssueCommand.issueType.indexOf(args.options.type) < 0) {
-            return `${args.options.type} is not a valid Issue type. Allowed values are ${CliIssueCommand.issueType.join(', ')}`;
+        if (_a.issueType.indexOf(args.options.type) < 0) {
+            return `${args.options.type} is not a valid Issue type. Allowed values are ${_a.issueType.join(', ')}`;
         }
         return true;
     });

package/dist/m365/cli/commands/config/config-get.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 _CliConfigGetCommand_instances, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
+var _CliConfigGetCommand_instances, _a, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -26,7 +26,7 @@ class CliConfigGetCommand extends AnonymousCommand {
         await logger.log(Cli.getInstance().config.get(args.options.key));
     }
 }
-_CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {
+_a = CliConfigGetCommand, _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemetry = function _CliConfigGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             key: args.options.key
@@ -35,12 +35,12 @@ _CliConfigGetCommand_instances = new WeakSet(), _CliConfigGetCommand_initTelemet
 }, _CliConfigGetCommand_initOptions = function _CliConfigGetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key <key>',
-        autocomplete: CliConfigGetCommand.optionNames
+        autocomplete: _a.optionNames
     });
 }, _CliConfigGetCommand_initValidators = function _CliConfigGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliConfigGetCommand.optionNames.indexOf(args.options.key) < 0) {
-            return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigGetCommand.optionNames.join(', ')}`;
+        if (_a.optionNames.indexOf(args.options.key) < 0) {
+            return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
         }
         return true;
     });

package/dist/m365/cli/commands/config/config-list.js

@@ -0,0 +1,16 @@
+import { Cli } from "../../../../cli/Cli.js";
+import AnonymousCommand from "../../../base/AnonymousCommand.js";
+import commands from "../../commands.js";
+class CliConfigListCommand extends AnonymousCommand {
+    get name() {
+        return commands.CONFIG_LIST;
+    }
+    get description() {
+        return 'List all self set CLI for Microsoft 365 configurations';
+    }
+    async commandAction(logger) {
+        await logger.log(Cli.getInstance().config.all);
+    }
+}
+export default new CliConfigListCommand();
+//# sourceMappingURL=config-list.js.map

package/dist/m365/cli/commands/config/config-reset.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 _CliConfigResetCommand_instances, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
+var _CliConfigResetCommand_instances, _a, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -31,7 +31,7 @@ class CliConfigResetCommand extends AnonymousCommand {
         }
     }
 }
-_CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {
+_a = CliConfigResetCommand, _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTelemetry = function _CliConfigResetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             key: args.options.key
@@ -40,13 +40,13 @@ _CliConfigResetCommand_instances = new WeakSet(), _CliConfigResetCommand_initTel
 }, _CliConfigResetCommand_initOptions = function _CliConfigResetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key [key]',
-        autocomplete: CliConfigResetCommand.optionNames
+        autocomplete: _a.optionNames
     });
 }, _CliConfigResetCommand_initValidators = function _CliConfigResetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.key) {
-            if (CliConfigResetCommand.optionNames.indexOf(args.options.key) < 0) {
-                return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigResetCommand.optionNames.join(', ')}`;
+            if (_a.optionNames.indexOf(args.options.key) < 0) {
+                return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
             }
         }
         return true;

package/dist/m365/cli/commands/config/config-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 _CliConfigSetCommand_instances, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
+var _CliConfigSetCommand_instances, _a, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
 import { Cli } from "../../../../cli/Cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
@@ -44,21 +44,21 @@ class CliConfigSetCommand extends AnonymousCommand {
         Cli.getInstance().config.set(args.options.key, value);
     }
 }
-_CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
+_a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemetry = function _CliConfigSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         this.telemetryProperties[args.options.key] = args.options.value;
     });
 }, _CliConfigSetCommand_initOptions = function _CliConfigSetCommand_initOptions() {
     this.options.unshift({
         option: '-k, --key <key>',
-        autocomplete: CliConfigSetCommand.optionNames
+        autocomplete: _a.optionNames
     }, {
         option: '-v, --value <value>'
     });
 }, _CliConfigSetCommand_initValidators = function _CliConfigSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
-            return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
+        if (_a.optionNames.indexOf(args.options.key) < 0) {
+            return `${args.options.key} is not a valid setting. Allowed values: ${_a.optionNames.join(', ')}`;
         }
         const allowedOutputs = ['text', 'json', 'csv', 'md', 'none'];
         if (args.options.key === settingsNames.output &&

package/dist/m365/cli/commands.js

@@ -6,6 +6,7 @@ export default {
     COMPLETION_SH_SETUP: `${prefix} completion sh setup`,
     COMPLETION_SH_UPDATE: `${prefix} completion sh update`,
     CONFIG_GET: `${prefix} config get`,
+    CONFIG_LIST: `${prefix} config list`,
     CONFIG_RESET: `${prefix} config reset`,
     CONFIG_SET: `${prefix} config set`,
     CONSENT: `${prefix} consent`,

package/dist/m365/commands/login.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 _LoginCommand_instances, _LoginCommand_initTelemetry, _LoginCommand_initOptions, _LoginCommand_initValidators;
+var _LoginCommand_instances, _a, _LoginCommand_initTelemetry, _LoginCommand_initOptions, _LoginCommand_initValidators;
 import fs from 'fs';
 import auth, { AuthType, CloudType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.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,
@@ -123,7 +123,7 @@ class LoginCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
+_a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             authType: args.options.authType || 'deviceCode',
@@ -133,7 +133,7 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
 }, _LoginCommand_initOptions = function _LoginCommand_initOptions() {
     this.options.unshift({
         option: '-t, --authType [authType]',
-        autocomplete: LoginCommand.allowedAuthTypes
+        autocomplete: _a.allowedAuthTypes
     }, {
         option: '-u, --userName [userName]'
     }, {
@@ -178,8 +178,8 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
             }
         }
         if (args.options.authType &&
-            LoginCommand.allowedAuthTypes.indexOf(args.options.authType) < 0) {
-            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${LoginCommand.allowedAuthTypes.join(', ')}`;
+            _a.allowedAuthTypes.indexOf(args.options.authType) < 0) {
+            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${_a.allowedAuthTypes.join(', ')}`;
         }
         if (args.options.authType === 'secret') {
             if (!args.options.secret) {

package/dist/m365/commands/request.js

@@ -6,10 +6,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _RequestCommand_instances, _RequestCommand_initTelemetry, _RequestCommand_initOptions, _RequestCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
+import auth from '../../Auth.js';
 import Command from '../../Command.js';
 import request from '../../request.js';
 import commands from './commands.js';
-import auth from '../../Auth.js';
 class RequestCommand extends Command {
     get name() {
         return commands.REQUEST;

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/flow/commands/owner/owner-ensure.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 _FlowOwnerEnsureCommand_instances, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
+var _FlowOwnerEnsureCommand_instances, _a, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
@@ -78,7 +78,7 @@ class FlowOwnerEnsureCommand extends AzmgmtCommand {
         }
     }
 }
-_FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initTelemetry = function _FlowOwnerEnsureCommand_initTelemetry() {
+_a = FlowOwnerEnsureCommand, _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initTelemetry = function _FlowOwnerEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             asAdmin: !!args.options.asAdmin,
@@ -103,7 +103,7 @@ _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initT
         option: '--groupName [groupName]'
     }, {
         option: '--roleName <roleName>',
-        autocomplete: FlowOwnerEnsureCommand.allowedRoleNames
+        autocomplete: _a.allowedRoleNames
     }, {
         option: '--asAdmin'
     });
@@ -123,8 +123,8 @@ _FlowOwnerEnsureCommand_instances = new WeakSet(), _FlowOwnerEnsureCommand_initT
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID.`;
         }
-        if (FlowOwnerEnsureCommand.allowedRoleNames.indexOf(args.options.roleName) === -1) {
-            return `${args.options.roleName} is not a valid roleName. Valid values are: ${FlowOwnerEnsureCommand.allowedRoleNames.join(', ')}`;
+        if (_a.allowedRoleNames.indexOf(args.options.roleName) === -1) {
+            return `${args.options.roleName} is not a valid roleName. Valid values are: ${_a.allowedRoleNames.join(', ')}`;
         }
         return true;
     });

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