@pnp/cli-microsoft365 7.0.0-beta.c0afb7b → 7.0.0-beta.c2db9df

package/README.md

@@ -20,9 +20,9 @@
       alt="Discord" />
   </a>
 
-  <a href="https://twitter.com/climicrosoft365">
-    <img src="https://img.shields.io/badge/Twitter-%40climicrosoft365-blue?style=flat-square"
-      alt="Twitter" />
+  <a href="https://x.com/climicrosoft365">
+    <img src="https://img.shields.io/badge/X-%40climicrosoft365-blue?style=flat-square"
+      alt="X" />
   </a>
 </p>
 
@@ -101,7 +101,7 @@
   - Upgrade your projects
   - Check your environment compatibility
 
-> Follow our [Twitter](https://twitter.com/climicrosoft365) account to keep yourself updated about new features, improvements, and bug fixes.
+> Follow our [X](https://x.com/climicrosoft365) account to keep yourself updated about new features, improvements, and bug fixes.
 
 ## Install
 

package/dist/cli/Cli.js

@@ -814,16 +814,16 @@ export class Cli {
         }
         return response;
     }
-    static async handleMultipleResultsFound(promptMessage, errorMessage, values) {
+    static async handleMultipleResultsFound(message, values) {
         const prompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, false);
         if (!prompt) {
-            throw errorMessage;
+            throw new Error(`${message} Found: ${Object.keys(values).join(', ')}.`);
         }
         const response = await Cli.prompt({
             type: 'list',
             name: 'select',
             default: 0,
-            message: promptMessage,
+            message: `${message} Please choose one:`,
             choices: Object.keys(values)
         });
         return values[response.select];

package/dist/m365/aad/commands/app/app-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 _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
+var _AadAppAddCommand_instances, _a, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 import fs from 'fs';
 import { v4 } from 'uuid';
 import auth from '../../../../Auth.js';
@@ -635,7 +635,7 @@ class AadAppAddCommand extends GraphCommand {
         return platform.charAt(0).toUpperCase() + platform.substring(1);
     }
 }
-_AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
+_a = AadAppAddCommand, _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             apis: typeof args.options.apisDelegated !== 'undefined',
@@ -664,7 +664,7 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         option: '-r, --redirectUris [redirectUris]'
     }, {
         option: '-p, --platform [platform]',
-        autocomplete: AadAppAddCommand.aadApplicationPlatform
+        autocomplete: _a.aadApplicationPlatform
     }, {
         option: '--implicitFlow'
     }, {
@@ -679,7 +679,7 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         option: '--scopeName [scopeName]'
     }, {
         option: '--scopeConsentBy [scopeConsentBy]',
-        autocomplete: AadAppAddCommand.aadAppScopeConsentBy
+        autocomplete: _a.aadAppScopeConsentBy
     }, {
         option: '--scopeAdminConsentDisplayName [scopeAdminConsentDisplayName]'
     }, {
@@ -700,8 +700,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.platform &&
-            AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
-            return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
+            _a.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
+            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.aadApplicationPlatform.join(', ')}`;
         }
         if (args.options.redirectUris && !args.options.platform) {
             return `When you specify redirectUris you also need to specify platform`;
@@ -727,8 +727,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
             }
         }
         if (args.options.scopeConsentBy &&
-            AadAppAddCommand.aadAppScopeConsentBy.indexOf(args.options.scopeConsentBy) < 0) {
-            return `${args.options.scopeConsentBy} is not a valid value for scopeConsentBy. Allowed values are ${AadAppAddCommand.aadAppScopeConsentBy.join(', ')}`;
+            _a.aadAppScopeConsentBy.indexOf(args.options.scopeConsentBy) < 0) {
+            return `${args.options.scopeConsentBy} is not a valid value for scopeConsentBy. Allowed values are ${_a.aadAppScopeConsentBy.join(', ')}`;
         }
         if (args.options.manifest) {
             try {

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

@@ -10,6 +10,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class AadAppGetCommand extends GraphCommand {
     get name() {
         return commands.APP_GET;
@@ -59,7 +60,9 @@ class AadAppGetCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async getAppInfo(appObjectId) {
         const requestOptions = {

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

@@ -86,7 +86,9 @@ class AadAppRemoveCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${name} found. Please choose one of the object IDs: ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
 }
 _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemetry = function _AadAppRemoveCommand_initTelemetry() {

package/dist/m365/aad/commands/app/app-role-add.js

@@ -3,12 +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 _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAppRoleAddCommand_initOptions, _AadAppRoleAddCommand_initValidators, _AadAppRoleAddCommand_initOptionSets;
+var _AadAppRoleAddCommand_instances, _a, _AadAppRoleAddCommand_initTelemetry, _AadAppRoleAddCommand_initOptions, _AadAppRoleAddCommand_initValidators, _AadAppRoleAddCommand_initOptionSets;
 import { v4 } from 'uuid';
 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 AadAppRoleAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_ADD;
@@ -104,10 +105,12 @@ class AadAppRoleAddCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
 }
-_AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelemetry = function _AadAppRoleAddCommand_initTelemetry() {
+_a = AadAppRoleAddCommand, _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelemetry = function _AadAppRoleAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -117,13 +120,13 @@ _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelem
     });
 }, _AadAppRoleAddCommand_initOptions = function _AadAppRoleAddCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name <name>' }, { option: '-d, --description <description>' }, {
-        option: '-m, --allowedMembers <allowedMembers>', autocomplete: AadAppRoleAddCommand.allowedMembers
+        option: '-m, --allowedMembers <allowedMembers>', autocomplete: _a.allowedMembers
     }, { option: '-c, --claim <claim>' });
 }, _AadAppRoleAddCommand_initValidators = function _AadAppRoleAddCommand_initValidators() {
     this.validators.push(async (args) => {
         const { allowedMembers, claim } = args.options;
-        if (AadAppRoleAddCommand.allowedMembers.indexOf(allowedMembers) < 0) {
-            return `${allowedMembers} is not a valid value for allowedMembers. Valid values are ${AadAppRoleAddCommand.allowedMembers.join(', ')}`;
+        if (_a.allowedMembers.indexOf(allowedMembers) < 0) {
+            return `${allowedMembers} is not a valid value for allowedMembers. Valid values are ${_a.allowedMembers.join(', ')}`;
         }
         if (claim.length > 120) {
             return `Claim must not be longer than 120 characters`;

package/dist/m365/aad/commands/app/app-role-list.js

@@ -9,6 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class AadAppRoleListCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_LIST;
@@ -62,7 +63,9 @@ class AadAppRoleListCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
 }
 _AadAppRoleListCommand_instances = new WeakSet(), _AadAppRoleListCommand_initTelemetry = function _AadAppRoleListCommand_initTelemetry() {

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -63,7 +63,8 @@ class AadAppRoleRemoveCommand extends GraphCommand {
         if (args.options.name &&
             appRoleToDelete !== undefined &&
             appRoleToDelete.length > 1) {
-            throw `Multiple roles with the provided 'name' were found. Please disambiguate using the claims : ${appRoleToDelete.map(role => `${role.value}`).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', appRoleToDelete);
+            appRoleToDelete[0] = await Cli.handleMultipleResultsFound(`Multiple roles with name '${args.options.name}' found.`, resultAsKeyValuePair);
         }
         if (appRoleToDelete.length === 0) {
             throw `No app role with ${appRoleDeleteIdentifierNameValue} found.`;
@@ -151,7 +152,9 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate using app object IDs: ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = (await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
+        return result.id;
     }
 }
 _AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_initTelemetry = function _AadAppRoleRemoveCommand_initTelemetry() {

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

@@ -3,12 +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 _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators, _AadAppSetCommand_initOptionSets;
+var _AadAppSetCommand_instances, _a, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators, _AadAppSetCommand_initOptionSets;
 import fs from 'fs';
 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 AadAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -61,7 +62,9 @@ class AadAppSetCommand extends GraphCommand {
             const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
-        throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
+        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        return result.id;
     }
     async configureUri(args, objectId, logger) {
         if (!args.options.uri) {
@@ -229,7 +232,7 @@ class AadAppSetCommand extends GraphCommand {
         return request.patch(requestOptions);
     }
 }
-_AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = function _AadAppSetCommand_initTelemetry() {
+_a = AadAppSetCommand, _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = function _AadAppSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -247,7 +250,7 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
 }, _AadAppSetCommand_initOptions = function _AadAppSetCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uri [uri]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {
         option: '--platform [platform]',
-        autocomplete: AadAppSetCommand.aadApplicationPlatform
+        autocomplete: _a.aadApplicationPlatform
     }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });
 }, _AadAppSetCommand_initValidators = function _AadAppSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -264,8 +267,8 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
             return `When you specify redirectUris you also need to specify platform`;
         }
         if (args.options.platform &&
-            AadAppSetCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
-            return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppSetCommand.aadApplicationPlatform.join(', ')}`;
+            _a.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
+            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.aadApplicationPlatform.join(', ')}`;
         }
         return true;
     });

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

@@ -10,6 +10,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class AadAppRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_ADD;
@@ -50,9 +51,13 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand {
                 throw `The specified service principal doesn't exist`;
             }
             if (servicePrincipalResult.value.length > 1) {
-                throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
+                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', servicePrincipalResult.value);
+                const result = await Cli.handleMultipleResultsFound(`Multiple service principal found.`, resultAsKeyValuePair);
+                objectId = result.id;
+            }
+            else {
+                objectId = servicePrincipalResult.value[0].id;
             }
-            objectId = servicePrincipalResult.value[0].id;
             let resource = formatting.encodeQueryParameter(args.options.resource);
             // try resolve aliases that the user might enter since these are seen in the Azure portal
             switch (args.options.resource.toLocaleLowerCase()) {

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

@@ -30,7 +30,7 @@ class AadGroupGetCommand extends GraphCommand {
                 group = await aadGroup.getGroupById(args.options.id);
             }
             else {
-                group = await aadGroup.getGroupByDisplayName(args.options.title);
+                group = await aadGroup.getGroupByDisplayName(args.options.displayName);
             }
             await logger.log(group);
         }
@@ -43,7 +43,7 @@ _AadGroupGetCommand_instances = new WeakSet(), _AadGroupGetCommand_initOptions =
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
-        option: '-t, --title [title]'
+        option: '-n, --displayName [displayName]'
     });
 }, _AadGroupGetCommand_initValidators = function _AadGroupGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -53,12 +53,12 @@ _AadGroupGetCommand_instances = new WeakSet(), _AadGroupGetCommand_initOptions =
         return true;
     });
 }, _AadGroupGetCommand_initOptionSets = function _AadGroupGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({ options: ['id', 'displayName'] });
 }, _AadGroupGetCommand_initTelemetry = function _AadGroupGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined'
         });
     });
 };

package/dist/m365/aad/commands/group/group-list.js

@@ -1,9 +1,3 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions;
 import { Cli } from '../../../../cli/Cli.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -15,19 +9,12 @@ class AadGroupListCommand extends GraphCommand {
     get description() {
         return 'Lists all groups defined in Azure Active Directory.';
     }
-    constructor() {
-        super();
-        _AadGroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initOptions).call(this);
-    }
     defaultProperties() {
         return ['id', 'displayName', 'groupType'];
     }
     async commandAction(logger, args) {
-        const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
         try {
-            const groups = await odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
+            const groups = await odata.getAllItems(`${this.resource}/v1.0/groups`);
             if (Cli.shouldTrimOutput(args.options.output)) {
                 groups.forEach((group) => {
                     if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
@@ -51,14 +38,5 @@ class AadGroupListCommand extends GraphCommand {
         }
     }
 }
-_AadGroupListCommand_instances = new WeakSet(), _AadGroupListCommand_initTelemetry = function _AadGroupListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            deleted: args.options.deleted
-        });
-    });
-}, _AadGroupListCommand_initOptions = function _AadGroupListCommand_initOptions() {
-    this.options.unshift({ option: '-d, --deleted' });
-};
 export default new AadGroupListCommand();
 //# sourceMappingURL=group-list.js.map

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

@@ -33,19 +33,19 @@ class AadM365GroupAddCommand extends GraphCommand {
         let memberIds = [];
         const resourceBehaviorOptionsCollection = [];
         if (this.verbose) {
-            await logger.logToStderr(`Creating Microsoft 365 Group...`);
+            await logger.logToStderr('Creating Microsoft 365 Group...');
         }
         if (args.options.allowMembersToPost) {
-            resourceBehaviorOptionsCollection.push("allowMembersToPost");
+            resourceBehaviorOptionsCollection.push('AllowOnlyMembersToPost');
         }
         if (args.options.hideGroupInOutlook) {
-            resourceBehaviorOptionsCollection.push("hideGroupInOutlook");
+            resourceBehaviorOptionsCollection.push('HideGroupInOutlook');
         }
         if (args.options.subscribeNewGroupMembers) {
-            resourceBehaviorOptionsCollection.push("subscribeNewGroupMembers");
+            resourceBehaviorOptionsCollection.push('SubscribeNewGroupMembers');
         }
         if (args.options.welcomeEmailDisabled) {
-            resourceBehaviorOptionsCollection.push("welcomeEmailDisabled");
+            resourceBehaviorOptionsCollection.push('WelcomeEmailDisabled');
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/groups`,
@@ -186,10 +186,10 @@ _AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initT
             members: typeof args.options.members !== 'undefined',
             logoPath: typeof args.options.logoPath !== 'undefined',
             isPrivate: typeof args.options.isPrivate !== 'undefined',
-            allowMembersToPost: args.options.allowMembersToPost,
-            hideGroupInOutlook: args.options.hideGroupInOutlook,
-            subscribeNewGroupMembers: args.options.subscribeNewGroupMembers,
-            welcomeEmailDisabled: args.options.welcomeEmailDisabled
+            allowMembersToPost: !!args.options.allowMembersToPost,
+            hideGroupInOutlook: !!args.options.hideGroupInOutlook,
+            subscribeNewGroupMembers: !!args.options.subscribeNewGroupMembers,
+            welcomeEmailDisabled: !!args.options.welcomeEmailDisabled
         });
     });
 }, _AadM365GroupAddCommand_initOptions = function _AadM365GroupAddCommand_initOptions() {
@@ -240,6 +240,9 @@ _AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initT
                 }
             }
         }
+        if (args.options.mailNickname.indexOf(' ') !== -1) {
+            return 'The option mailNickname cannot contain spaces.';
+        }
         if (args.options.logoPath) {
             const fullPath = path.resolve(args.options.logoPath);
             if (!fs.existsSync(fullPath)) {

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

@@ -82,7 +82,9 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             throw Error(`The specified group '${displayName || mailNickname}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`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-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-teamify.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 _AadM365GroupTeamifyCommand_instances, _AadM365GroupTeamifyCommand_initTelemetry, _AadM365GroupTeamifyCommand_initOptions, _AadM365GroupTeamifyCommand_initValidators, _AadM365GroupTeamifyCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -41,7 +42,9 @@ 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 '${args.options.mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groupItem.id;
     }

package/dist/m365/aad/commands/policy/policy-list.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 _AadPolicyListCommand_instances, _AadPolicyListCommand_initTelemetry, _AadPolicyListCommand_initOptions, _AadPolicyListCommand_initValidators;
+var _AadPolicyListCommand_instances, _a, _AadPolicyListCommand_initTelemetry, _AadPolicyListCommand_initOptions, _AadPolicyListCommand_initValidators;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -73,7 +73,7 @@ class AadPolicyListCommand extends GraphCommand {
         }
     }
 }
-_AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
+_a = AadPolicyListCommand, _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             policyType: args.options.type || 'all'
@@ -82,14 +82,14 @@ _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelem
 }, _AadPolicyListCommand_initOptions = function _AadPolicyListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        autocomplete: AadPolicyListCommand.supportedPolicyTypes
+        autocomplete: _a.supportedPolicyTypes
     });
 }, _AadPolicyListCommand_initValidators = function _AadPolicyListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type) {
             const policyType = args.options.type.toLowerCase();
-            if (!AadPolicyListCommand.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
-                return `${args.options.type} is not a valid type. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
+            if (!_a.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
+                return `${args.options.type} is not a valid type. Allowed values are ${_a.supportedPolicyTypes.join(', ')}`;
             }
         }
         return true;

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