@pnp/cli-microsoft365 7.3.0-beta.73848f3 → 7.3.0-beta.9479ed4

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

@@ -0,0 +1,237 @@
+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 _AadAppPermissionAddCommand_instances, _AadAppPermissionAddCommand_initTelemetry, _AadAppPermissionAddCommand_initOptions, _AadAppPermissionAddCommand_initValidators, _AadAppPermissionAddCommand_initOptionSets;
+import { odata } from "../../../../utils/odata.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import request from "../../../../request.js";
+import { validation } from "../../../../utils/validation.js";
+var ScopeType;
+(function (ScopeType) {
+    ScopeType["Role"] = "Role";
+    ScopeType["Scope"] = "Scope";
+})(ScopeType || (ScopeType = {}));
+class AadAppPermissionAddCommand extends GraphCommand {
+    get name() {
+        return commands.APP_PERMISSION_ADD;
+    }
+    get description() {
+        return 'Adds the specified application and/or delegated permissions to a specified Entra ID (Azure AD) app';
+    }
+    constructor() {
+        super();
+        _AadAppPermissionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const appObject = await this.getAppObject(args.options);
+            const servicePrincipals = await this.getServicePrincipals();
+            const appPermissions = [];
+            if (args.options.delegatedPermissions) {
+                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
+                this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
+            }
+            if (args.options.applicationPermissions) {
+                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
+                this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
+            }
+            const addPermissionsRequestOptions = {
+                url: `${this.resource}/v1.0/applications/${appObject.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requiredResourceAccess: appObject.requiredResourceAccess
+                }
+            };
+            await request.patch(addPermissionsRequestOptions);
+            if (args.options.grantAdminConsent) {
+                const appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObject(options) {
+        let apps;
+        if (options.appObjectId) {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications/${options.appObjectId}?$select=id,appId,requiredResourceAccess`);
+        }
+        else {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications(appId='${options.appId}')?$select=id,appId,requiredResourceAccess`);
+        }
+        if (apps.length === 0) {
+            throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Entra ID (Azure AD)`;
+        }
+        return apps[0];
+    }
+    async getServicePrincipals() {
+        return await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
+    }
+    async grantAdminConsent(servicePrincipal, appPermissions, logger) {
+        for await (const permission of appPermissions) {
+            if (permission.scope.length > 0) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Granting consent for delegated permission(s) with resourceId ${permission.resourceId} and scope(s) ${permission.scope.join(' ')}`);
+                }
+                await this.grantOAuth2Permission(servicePrincipal.id, permission.resourceId, permission.scope.join(' '));
+            }
+            for await (const access of permission.resourceAccess.filter(acc => acc.type === ScopeType.Role)) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Granting consent for application permission with resourceId ${permission.resourceId} and appRoleId ${access.id}`);
+                }
+                await this.addRoleToServicePrincipal(servicePrincipal.id, permission.resourceId, access.id);
+            }
+        }
+    }
+    async grantOAuth2Permission(servicePrincipalId, resourceId, scope) {
+        const grantAdminConsentApplicationRequestOptions = {
+            url: `${this.resource}/v1.0/oauth2PermissionGrants`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                clientId: servicePrincipalId,
+                consentType: 'AllPrincipals',
+                principalId: null,
+                resourceId: resourceId,
+                scope: scope
+            }
+        };
+        return request.post(grantAdminConsentApplicationRequestOptions);
+    }
+    async addRoleToServicePrincipal(servicePrincipalId, resourceId, appRoleId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipalId}/appRoleAssignments`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                appRoleId: appRoleId,
+                principalId: servicePrincipalId,
+                resourceId: resourceId
+            }
+        };
+        return request.post(requestOptions);
+    }
+    async getRequiredResourceAccessForApis(servicePrincipals, apis, scopeType, appPermissions, logger) {
+        const resolvedApis = [];
+        const requestedApis = apis.split(' ').map(a => a.trim());
+        for await (const api of requestedApis) {
+            const pos = api.lastIndexOf('/');
+            const permissionName = api.substring(pos + 1);
+            const servicePrincipalName = api.substring(0, pos);
+            if (this.verbose) {
+                await logger.logToStderr(`Resolving ${api}...`);
+                await logger.logToStderr(`Permission name: ${permissionName}`);
+                await logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
+            }
+            const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
+                sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
+            if (!servicePrincipal) {
+                throw `Service principal ${servicePrincipalName} not found`;
+            }
+            let permission = undefined;
+            if (scopeType === ScopeType.Scope) {
+                permission = servicePrincipal.oauth2PermissionScopes.find(scope => scope.value === permissionName);
+            }
+            else if (scopeType === ScopeType.Role) {
+                permission = servicePrincipal.appRoles.find(scope => scope.value === permissionName);
+            }
+            if (!permission) {
+                throw `Permission ${permissionName} for service principal ${servicePrincipalName} not found`;
+            }
+            let resolvedApi = resolvedApis.find(a => a.resourceAppId === servicePrincipal.appId);
+            if (!resolvedApi) {
+                resolvedApi = {
+                    resourceAppId: servicePrincipal.appId,
+                    resourceAccess: []
+                };
+                resolvedApis.push(resolvedApi);
+            }
+            const resourceAccessPermission = {
+                id: permission.id,
+                type: scopeType
+            };
+            resolvedApi.resourceAccess.push(resourceAccessPermission);
+            this.updateAppPermissions(servicePrincipal.id, resourceAccessPermission, permission.value, appPermissions);
+        }
+        return resolvedApis;
+    }
+    updateAppPermissions(spId, resourceAccessPermission, oAuth2PermissionValue, appPermissions) {
+        let existingPermission = appPermissions.find(oauth => oauth.resourceId === spId);
+        if (!existingPermission) {
+            existingPermission = {
+                resourceId: spId,
+                resourceAccess: [],
+                scope: []
+            };
+            appPermissions.push(existingPermission);
+        }
+        if (resourceAccessPermission.type === ScopeType.Scope && oAuth2PermissionValue && !existingPermission.scope.find(scp => scp === oAuth2PermissionValue)) {
+            existingPermission.scope.push(oAuth2PermissionValue);
+        }
+        if (!existingPermission.resourceAccess.find(res => res.id === resourceAccessPermission.id)) {
+            existingPermission.resourceAccess.push(resourceAccessPermission);
+        }
+    }
+    addPermissionsToResourceArray(permissions, existingArray) {
+        permissions.forEach(resolvedRequiredResource => {
+            const requiredResource = existingArray.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
+            if (requiredResource) {
+                // make sure that permission does not yet exist on the app or it will be added twice
+                resolvedRequiredResource.resourceAccess.forEach(resAccess => {
+                    if (!requiredResource.resourceAccess.some(res => res.id === resAccess.id)) {
+                        requiredResource.resourceAccess.push(resAccess);
+                    }
+                });
+            }
+            else {
+                existingArray.push(resolvedRequiredResource);
+            }
+        });
+    }
+}
+_AadAppPermissionAddCommand_instances = new WeakSet(), _AadAppPermissionAddCommand_initTelemetry = function _AadAppPermissionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
+            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
+            grantAdminConsent: !!args.options.grantAdminConsent
+        });
+    });
+}, _AadAppPermissionAddCommand_initOptions = function _AadAppPermissionAddCommand_initOptions() {
+    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
+}, _AadAppPermissionAddCommand_initValidators = function _AadAppPermissionAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAppPermissionAddCommand_initOptionSets = function _AadAppPermissionAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['appId', 'appObjectId'] });
+    this.optionSets.push({
+        options: ['applicationPermissions', 'delegatedPermissions'],
+        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
+    });
+};
+export default new AadAppPermissionAddCommand();
+//# sourceMappingURL=app-permission-add.js.map

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -49,7 +49,7 @@ class AadAppRemoveCommand extends GraphCommand {
             await deleteApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
             if (result) {
                 await deleteApp();
             }
@@ -82,7 +82,7 @@ class AadAppRemoveCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_ADD;
@@ -106,7 +106,7 @@ class AadAppRoleAddCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleListCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_LIST;
@@ -64,7 +64,7 @@ class AadAppRoleListCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators, _AadAppRoleRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from "../../../../utils/formatting.js";
 import { validation } from '../../../../utils/validation.js';
@@ -38,7 +38,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             await deleteAppRole();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
             if (result) {
                 await deleteAppRole();
             }
@@ -59,7 +59,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             appRoleToDelete !== undefined &&
             appRoleToDelete.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', appRoleToDelete);
-            appRoleToDelete[0] = await Cli.handleMultipleResultsFound(`Multiple roles with name '${args.options.name}' found.`, resultAsKeyValuePair);
+            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.`;
@@ -148,7 +148,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = (await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
+        const result = (await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
         return result.id;
     }
 }

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

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -63,7 +63,7 @@ class AadAppSetCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
     async configureUri(args, objectId, logger) {

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

@@ -10,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_ADD;
@@ -52,7 +52,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand {
             }
             if (servicePrincipalResult.value.length > 1) {
                 const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', servicePrincipalResult.value);
-                const result = await Cli.handleMultipleResultsFound(`Multiple service principal found.`, resultAsKeyValuePair);
+                const result = await cli.handleMultipleResultsFound(`Multiple service principal found.`, resultAsKeyValuePair);
                 objectId = result.id;
             }
             else {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
 import os from 'os';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -111,7 +111,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
             await removeAppRoleAssignment();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
             if (result) {
                 await removeAppRoleAssignment();
             }

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

@@ -1,4 +1,10 @@
-import { Cli } from '../../../../cli/Cli.js';
+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, _a, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions, _AadGroupListCommand_initValidators;
+import { cli } from '../../../../cli/cli.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -12,10 +18,52 @@ class AadGroupListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'groupType'];
     }
+    constructor() {
+        super();
+        _AadGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initValidators).call(this);
+    }
     async commandAction(logger, args) {
         try {
-            const groups = await odata.getAllItems(`${this.resource}/v1.0/groups`);
-            if (Cli.shouldTrimOutput(args.options.output)) {
+            let requestUrl = `${this.resource}/v1.0/groups`;
+            let useConsistencyLevelHeader = false;
+            if (args.options.type) {
+                const groupType = _a.groupTypes.find(g => g.toLowerCase() === args.options.type?.toLowerCase());
+                switch (groupType) {
+                    case 'microsoft365':
+                        requestUrl += `?$filter=groupTypes/any(c:c+eq+'Unified')`;
+                        break;
+                    case 'security':
+                        requestUrl += '?$filter=securityEnabled eq true and mailEnabled eq false';
+                        break;
+                    case 'distribution':
+                        requestUrl += '?$filter=securityEnabled eq false and mailEnabled eq true';
+                        break;
+                    case 'mailEnabledSecurity':
+                        useConsistencyLevelHeader = true;
+                        requestUrl += `?$filter=securityEnabled eq true and mailEnabled eq true and not(groupTypes/any(t:t eq 'Unified'))&$count=true`;
+                        break;
+                }
+            }
+            let groups = [];
+            if (useConsistencyLevelHeader) {
+                // While using not() function in the filter, we need to specify the ConsistencyLevel header.
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        ConsistencyLevel: 'eventual'
+                    },
+                    responseType: 'json'
+                };
+                groups = await odata.getAllItems(requestOptions);
+            }
+            else {
+                groups = await odata.getAllItems(requestUrl);
+            }
+            if (cli.shouldTrimOutput(args.options.output)) {
                 groups.forEach((group) => {
                     if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                         group.groupType = 'Microsoft 365';
@@ -38,5 +86,25 @@ class AadGroupListCommand extends GraphCommand {
         }
     }
 }
+_a = AadGroupListCommand, _AadGroupListCommand_instances = new WeakSet(), _AadGroupListCommand_initTelemetry = function _AadGroupListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            type: typeof args.options.type !== 'undefined'
+        });
+    });
+}, _AadGroupListCommand_initOptions = function _AadGroupListCommand_initOptions() {
+    this.options.unshift({
+        option: '--type [type]',
+        autocomplete: _a.groupTypes
+    });
+}, _AadGroupListCommand_initValidators = function _AadGroupListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.type && _a.groupTypes.every(g => g.toLowerCase() !== args.options.type?.toLowerCase())) {
+            return `${args.options.type} is not a valid type value. Allowed values microsoft365|security|distribution|mailEnabledSecurity.`;
+        }
+        return true;
+    });
+};
+AadGroupListCommand.groupTypes = ['microsoft365', 'security', 'distribution', 'mailEnabledSecurity'];
 export default new AadGroupListCommand();
 //# sourceMappingURL=group-list.js.map

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
@@ -52,7 +52,7 @@ class AadGroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
             if (result) {
                 await removeGroup();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadGroupSettingRemoveCommand_instances, _AadGroupSettingRemoveCommand_initTelemetry, _AadGroupSettingRemoveCommand_initOptions, _AadGroupSettingRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -45,7 +45,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand {
             await removeGroupSetting();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
             if (result) {
                 await removeGroupSetting();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRecycleBinItemClearCommand_instances, _AadM365GroupRecycleBinItemClearCommand_initTelemetry, _AadM365GroupRecycleBinItemClearCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
             await clearM365GroupRecycleBinItems();
         }
         else {
-            const response = await Cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
+            const response = await cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
             if (response) {
                 await clearM365GroupRecycleBinItems();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRecycleBinItemRemoveCommand_instances, _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadM365GroupRecycleBinItemRemoveCommand_initOptions, _AadM365GroupRecycleBinItemRemoveCommand_initValidators, _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -46,7 +46,7 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
             if (result) {
                 await removeGroup();
             }
@@ -78,7 +78,7 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            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,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_RESTORE;
@@ -71,7 +71,7 @@ class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groups[0].id;

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRemoveCommand_instances, _AadM365GroupRemoveCommand_initTelemetry, _AadM365GroupRemoveCommand_initOptions, _AadM365GroupRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -56,7 +56,7 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
             if (result) {
                 await removeGroup();
             }

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

@@ -4,7 +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 { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -44,7 +44,7 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groupItem.id;