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

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

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)) {

package/dist/cli/Cli.js

@@ -814,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];

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

@@ -9,6 +9,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 AadAppRoleAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_ADD;
@@ -104,7 +105,9 @@ 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;
     }
 }
 _a = AadAppRoleAddCommand, _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelemetry = function _AadAppRoleAddCommand_initTelemetry() {

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

@@ -9,6 +9,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 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 = {
@@ -238,14 +241,14 @@ _a = AadAppSetCommand, _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCo
             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: _a.aadApplicationPlatform
     }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });

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

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

@@ -0,0 +1,98 @@
+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 _AadGroupRemoveCommand_instances, _AadGroupRemoveCommand_initTelemetry, _AadGroupRemoveCommand_initOptions, _AadGroupRemoveCommand_initOptionSets, _AadGroupRemoveCommand_initValidators, _AadGroupRemoveCommand_initTypes;
+import { Cli } from '../../../../cli/Cli.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import { validation } from '../../../../utils/validation.js';
+class AadGroupRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes an Azure AD group';
+    }
+    constructor() {
+        super();
+        _AadGroupRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeGroup = async () => {
+            if (this.verbose) {
+                await logger.logToStderr(`Removing group ${args.options.id || args.options.displayName}...`);
+            }
+            try {
+                let groupId = args.options.id;
+                if (args.options.displayName) {
+                    groupId = await aadGroup.getGroupIdByDisplayName(args.options.displayName);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeGroup();
+        }
+        else {
+            const result = await Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?`
+            });
+            if (result.continue) {
+                await removeGroup();
+            }
+        }
+    }
+}
+_AadGroupRemoveCommand_instances = new WeakSet(), _AadGroupRemoveCommand_initTelemetry = function _AadGroupRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: args.options.id !== 'undefined',
+            displayName: args.options.displayName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _AadGroupRemoveCommand_initOptions = function _AadGroupRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _AadGroupRemoveCommand_initOptionSets = function _AadGroupRemoveCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'displayName']
+    });
+}, _AadGroupRemoveCommand_initValidators = function _AadGroupRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
+        return true;
+    });
+}, _AadGroupRemoveCommand_initTypes = function _AadGroupRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
+};
+export default new AadGroupRemoveCommand();
+//# sourceMappingURL=group-remove.js.map

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

@@ -22,6 +22,7 @@ class AadM365GroupAddCommand extends GraphCommand {
         super();
         _AadM365GroupAddCommand_instances.add(this);
         this.pollingInterval = 500;
+        this.allowedVisibilities = ['Private', 'Public', 'HiddenMembership'];
         __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initTypes).call(this);
@@ -32,20 +33,21 @@ class AadM365GroupAddCommand extends GraphCommand {
         let ownerIds = [];
         let memberIds = [];
         const resourceBehaviorOptionsCollection = [];
+        const resolvedVisibility = args.options.visibility || 'Public';
         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`,
@@ -63,7 +65,7 @@ class AadM365GroupAddCommand extends GraphCommand {
                 mailNickname: args.options.mailNickname,
                 resourceBehaviorOptions: resourceBehaviorOptionsCollection,
                 securityEnabled: false,
-                visibility: args.options.isPrivate ? 'Private' : 'Public'
+                visibility: resolvedVisibility
             }
         };
         try {
@@ -185,11 +187,11 @@ _AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initT
             owners: typeof args.options.owners !== 'undefined',
             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
+            visibility: typeof args.options.visibility !== 'undefined',
+            allowMembersToPost: !!args.options.allowMembersToPost,
+            hideGroupInOutlook: !!args.options.hideGroupInOutlook,
+            subscribeNewGroupMembers: !!args.options.subscribeNewGroupMembers,
+            welcomeEmailDisabled: !!args.options.welcomeEmailDisabled
         });
     });
 }, _AadM365GroupAddCommand_initOptions = function _AadM365GroupAddCommand_initOptions() {
@@ -204,7 +206,8 @@ _AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initT
     }, {
         option: '--members [members]'
     }, {
-        option: '--isPrivate'
+        option: '--visibility [visibility]',
+        autocomplete: this.allowedVisibilities
     }, {
         option: '--allowMembersToPost [allowMembersToPost]',
         autocomplete: ['true', 'false']
@@ -240,6 +243,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)) {
@@ -249,6 +255,9 @@ _AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initT
                 return `Path '${fullPath}' points to a directory`;
             }
         }
+        if (args.options.visibility && this.allowedVisibilities.map(x => x.toLowerCase()).indexOf(args.options.visibility.toLowerCase()) === -1) {
+            return `${args.options.visibility} is not a valid visibility. Allowed values are ${this.allowedVisibilities.join(', ')}`;
+        }
         return true;
     });
 };

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

@@ -8,6 +8,7 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 class AadM365GroupConversationListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_CONVERSATION_LIST;
@@ -26,6 +27,10 @@ class AadM365GroupConversationListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
+            }
             const conversations = await odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
             await logger.log(conversations);
         }

package/dist/m365/aad/commands/m365group/m365group-conversation-post-list.js

@@ -31,6 +31,10 @@ class AadM365GroupConversationPostListCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const retrievedgroupId = await this.getGroupId(args);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(retrievedgroupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${retrievedgroupId}' is not a Microsoft 365 group.`);
+            }
             const posts = await odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
             await logger.log(posts);
         }

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

@@ -25,10 +25,11 @@ class AadM365GroupGetCommand extends GraphCommand {
     async commandAction(logger, args) {
         let group;
         try {
-            group = await aadGroup.getGroupById(args.options.id);
-            if (!group.groupTypes.some(type => type === 'Unified')) {
-                throw `Specified group with id '${args.options.id}' is not a Microsoft 365 group.`;
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }
+            group = await aadGroup.getGroupById(args.options.id);
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,

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