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

package/.eslintrc.cjs

@@ -57,13 +57,13 @@ const dictionary = [
   'member',
   'messaging',
   'model',
+  'm365',
   'news',
   'oauth2',
   'office365',
   'one',
   'org',
   'owner',
-  'o365',
   'permission',
   'place',
   'policy',
@@ -128,8 +128,6 @@ module.exports = {
     "mocha"
   ],
   "ignorePatterns": [
-    "**/pcf-init/assets/**",
-    "**/solution-init/assets/**",
     "**/package-generate/assets/**",
     "**/test-projects/**",
     "clientsidepages.ts",

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/Auth.js

@@ -338,7 +338,16 @@ export class Auth {
             await logger.logToStderr(response);
             await logger.logToStderr('');
         }
-        await logger.log(response.message);
+        const cli = Cli.getInstance();
+        cli.spinner.text = response.message;
+        cli.spinner.spinner = {
+            frames: ['🌶️  ']
+        };
+        // don't show spinner if running tests
+        /* c8 ignore next 3 */
+        if (!cli.spinner.isSpinning && typeof global.it === 'undefined') {
+            cli.spinner.start();
+        }
         if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
             browserUtil.open(response.verificationUri);
         }
@@ -558,7 +567,8 @@ export class Auth {
             resource = resource.substr(0, pos);
         }
         if (resource === 'https://api.bap.microsoft.com' ||
-            resource === 'https://api.powerapps.com') {
+            resource === 'https://api.powerapps.com' ||
+            resource.endsWith('.api.bap.microsoft.com')) {
             resource = 'https://service.powerapps.com/';
         }
         if (resource === 'https://api.powerbi.com') {

package/dist/Command.js

@@ -74,7 +74,7 @@ class Command {
         return true;
     }
     async validateRequiredOptions(args, command) {
-        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, false);
+        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         let inquirer;
         let prompted = false;
         for (let i = 0; i < command.options.length; i++) {
@@ -109,7 +109,7 @@ class Command {
             return true;
         }
         let inquirer;
-        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, false);
+        const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         const argsOptions = Object.keys(args.options);
         for (const optionSet of optionsSets.sort(opt => opt.runsWhen ? 0 : 1)) {
             if (optionSet.runsWhen && !optionSet.runsWhen(args)) {
@@ -146,7 +146,7 @@ class Command {
         const resultOptionValue = await inquirer.default
             .prompt({
             name: 'missingRequiredOptionValue',
-            message: `Value for '${missingRequiredOptionName}':`
+            message: `${missingRequiredOptionName}:`
         });
         args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
         Cli.log();

package/dist/GlobalOptions.js

@@ -1,8 +1,2 @@
-export var Output;
-(function (Output) {
-    Output[Output["text"] = 0] = "text";
-    Output[Output["json"] = 1] = "json";
-    Output[Output["csv"] = 2] = "csv";
-    Output[Output["md"] = 3] = "md";
-})(Output || (Output = {}));
+export {};
 //# sourceMappingURL=GlobalOptions.js.map

package/dist/cli/Cli.js

@@ -761,8 +761,9 @@ export class Cli {
     }
     static log(message, ...optionalParams) {
         const cli = Cli.getInstance();
+        const spinnerSpinning = cli.spinner.isSpinning;
         /* c8 ignore next 3 */
-        if (cli.spinner.isSpinning) {
+        if (spinnerSpinning) {
             cli.spinner.stop();
         }
         if (message) {
@@ -771,15 +772,31 @@ export class Cli {
         else {
             console.log();
         }
+        // Restart the spinner if it was running before the log
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.start();
+        }
     }
     static async error(message, ...optionalParams) {
-        const errorOutput = await Cli.getInstance().getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
+        const cli = Cli.getInstance();
+        const spinnerSpinning = cli.spinner.isSpinning;
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.stop();
+        }
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
         if (errorOutput === 'stdout') {
             console.log(message, ...optionalParams);
         }
         else {
             console.error(message, ...optionalParams);
         }
+        // Restart the spinner if it was running before the log
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.start();
+        }
     }
     static async prompt(options, answers) {
         const inquirer = await import('inquirer');
@@ -797,16 +814,16 @@ export class Cli {
         }
         return response;
     }
-    static async handleMultipleResultsFound(promptMessage, errorMessage, values) {
-        const prompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, false);
+    static async handleMultipleResultsFound(message, values) {
+        const prompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         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];
@@ -839,6 +856,6 @@ export class Cli {
         return output === 'text';
     }
 }
-Cli.defaultHelpMode = 'full';
+Cli.defaultHelpMode = 'options';
 Cli.helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
 //# sourceMappingURL=Cli.js.map

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,16 +62,18 @@ 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) {
+        if (!args.options.uris) {
             return objectId;
         }
         if (this.verbose) {
             await logger.logToStderr(`Configuring Azure AD application ID URI...`);
         }
-        const identifierUris = args.options.uri
+        const identifierUris = args.options.uris
             .split(',')
             .map(u => u.trim());
         const applicationInfo = {
@@ -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',
@@ -238,16 +241,16 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
             platform: typeof args.options.platform !== 'undefined',
             redirectUris: typeof args.options.redirectUris !== 'undefined',
             redirectUrisToRemove: typeof args.options.redirectUrisToRemove !== 'undefined',
-            uri: typeof args.options.uri !== 'undefined',
+            uris: typeof args.options.uris !== 'undefined',
             certificateFile: typeof args.options.certificateFile !== 'undefined',
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
             certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined'
         });
     });
 }, _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]' }, {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uris [uris]' }, { 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()) {
@@ -94,13 +99,13 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand {
             if (!appRolesFound.length) {
                 throw `The resource '${args.options.resource}' does not have any application permissions available.`;
             }
-            // search for match between the found app roles and the specified scope option value
-            for (const scope of args.options.scope.split(',')) {
+            // search for match between the found app roles and the specified scopes option value
+            for (const scope of args.options.scopes.split(',')) {
                 const existingRoles = appRolesFound.filter((role) => {
                     return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                 });
                 if (!existingRoles.length) {
-                    // the role specified in the scope option does not belong to the found service principles
+                    // the role specified in the scopes option does not belong to the found service principles
                     // throw an error and show list with available roles (scopes)
                     let availableRoles = '';
                     appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
@@ -163,7 +168,7 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
         option: '-r, --resource <resource>',
         autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
     }, {
-        option: '-s, --scope <scope>'
+        option: '-s, --scopes <scopes>'
     });
 }, _AadAppRoleAssignmentAddCommand_initValidators = function _AadAppRoleAssignmentAddCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -80,12 +80,12 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
                 if (!appRolesFound.length) {
                     throw `The resource '${args.options.resource}' does not have any application permissions available.`;
                 }
-                for (const scope of args.options.scope.split(',')) {
+                for (const scope of args.options.scopes.split(',')) {
                     const existingRoles = appRolesFound.filter((role) => {
                         return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                     });
                     if (!existingRoles.length) {
-                        // the role specified in the scope option does not belong to the found service principles
+                        // the role specified in the scopes option does not belong to the found service principles
                         // throw an error and show list with available roles (scopes)
                         let availableRoles = '';
                         appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
@@ -115,7 +115,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?`
+                message: `Are you sure you want to remove the appRoleAssignment with scopes ${args.options.scopes} for resource ${args.options.resource}?`
             });
             if (result.continue) {
                 await removeAppRoleAssignment();
@@ -163,7 +163,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
         option: '-r, --resource <resource>',
         autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
     }, {
-        option: '-s, --scope <scope>'
+        option: '-s, --scopes <scopes>'
     }, {
         option: '-f, --force'
     });

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