@pnp/cli-microsoft365 7.4.0-beta.fce7b64 → 7.5.0-beta.0ae7da4

package/dist/m365/{aad → entra}/commands/approleassignment/approleassignment-list.js

@@ -3,26 +3,30 @@ 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 _AadAppRoleAssignmentListCommand_instances, _AadAppRoleAssignmentListCommand_initTelemetry, _AadAppRoleAssignmentListCommand_initOptions, _AadAppRoleAssignmentListCommand_initValidators, _AadAppRoleAssignmentListCommand_initOptionSets;
+var _EntraAppRoleAssignmentListCommand_instances, _EntraAppRoleAssignmentListCommand_initTelemetry, _EntraAppRoleAssignmentListCommand_initOptions, _EntraAppRoleAssignmentListCommand_initValidators, _EntraAppRoleAssignmentListCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadAppRoleAssignmentListCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAppRoleAssignmentListCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_LIST;
     }
     get description() {
         return 'Lists app role assignments for the specified application registration';
     }
+    alias() {
+        return [aadCommands.APPROLEASSIGNMENT_LIST];
+    }
     constructor() {
         super();
-        _AadAppRoleAssignmentListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initOptionSets).call(this);
+        _EntraAppRoleAssignmentListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentListCommand_instances, "m", _EntraAppRoleAssignmentListCommand_initOptionSets).call(this);
     }
     defaultProperties() {
         return ['resourceDisplayName', 'roleName'];
@@ -115,7 +119,7 @@ class AadAppRoleAssignmentListCommand extends GraphCommand {
         return request.get(spRequestOptions);
     }
 }
-_AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmentListCommand_initTelemetry = function _AadAppRoleAssignmentListCommand_initTelemetry() {
+_EntraAppRoleAssignmentListCommand_instances = new WeakSet(), _EntraAppRoleAssignmentListCommand_initTelemetry = function _EntraAppRoleAssignmentListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -123,7 +127,7 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
             appObjectId: typeof args.options.appObjectId !== 'undefined'
         });
     });
-}, _AadAppRoleAssignmentListCommand_initOptions = function _AadAppRoleAssignmentListCommand_initOptions() {
+}, _EntraAppRoleAssignmentListCommand_initOptions = function _EntraAppRoleAssignmentListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
@@ -131,7 +135,7 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
     }, {
         option: '--appObjectId [appObjectId]'
     });
-}, _AadAppRoleAssignmentListCommand_initValidators = function _AadAppRoleAssignmentListCommand_initValidators() {
+}, _EntraAppRoleAssignmentListCommand_initValidators = function _EntraAppRoleAssignmentListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
@@ -141,8 +145,8 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
         }
         return true;
     });
-}, _AadAppRoleAssignmentListCommand_initOptionSets = function _AadAppRoleAssignmentListCommand_initOptionSets() {
+}, _EntraAppRoleAssignmentListCommand_initOptionSets = function _EntraAppRoleAssignmentListCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
-export default new AadAppRoleAssignmentListCommand();
+export default new EntraAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

package/dist/m365/{aad → entra}/commands/approleassignment/approleassignment-remove.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 _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
+var _EntraAppRoleAssignmentRemoveCommand_instances, _EntraAppRoleAssignmentRemoveCommand_initTelemetry, _EntraAppRoleAssignmentRemoveCommand_initOptions, _EntraAppRoleAssignmentRemoveCommand_initValidators, _EntraAppRoleAssignmentRemoveCommand_initOptionSets;
 import os from 'os';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
@@ -11,20 +11,24 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraAppRoleAssignmentRemoveCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_REMOVE;
     }
     get description() {
-        return 'Deletes an app role assignment for the specified Azure AD Application Registration';
+        return 'Deletes an app role assignment for the specified Entra Application Registration';
+    }
+    alias() {
+        return [aadCommands.APPROLEASSIGNMENT_REMOVE];
     }
     constructor() {
         super();
-        _AadAppRoleAssignmentRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initOptionSets).call(this);
+        _EntraAppRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAppRoleAssignmentRemoveCommand_instances, "m", _EntraAppRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const removeAppRoleAssignment = async () => {
@@ -138,7 +142,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
         return request.delete(spRequestOptions);
     }
 }
-_AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignmentRemoveCommand_initTelemetry = function _AadAppRoleAssignmentRemoveCommand_initTelemetry() {
+_EntraAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _EntraAppRoleAssignmentRemoveCommand_initTelemetry = function _EntraAppRoleAssignmentRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
@@ -147,7 +151,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
             force: (!!args.options.force).toString()
         });
     });
-}, _AadAppRoleAssignmentRemoveCommand_initOptions = function _AadAppRoleAssignmentRemoveCommand_initOptions() {
+}, _EntraAppRoleAssignmentRemoveCommand_initOptions = function _EntraAppRoleAssignmentRemoveCommand_initOptions() {
     this.options.unshift({
         option: '--appId [appId]'
     }, {
@@ -162,7 +166,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     }, {
         option: '-f, --force'
     });
-}, _AadAppRoleAssignmentRemoveCommand_initValidators = function _AadAppRoleAssignmentRemoveCommand_initValidators() {
+}, _EntraAppRoleAssignmentRemoveCommand_initValidators = function _EntraAppRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
@@ -172,8 +176,8 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
         }
         return true;
     });
-}, _AadAppRoleAssignmentRemoveCommand_initOptionSets = function _AadAppRoleAssignmentRemoveCommand_initOptionSets() {
+}, _EntraAppRoleAssignmentRemoveCommand_initOptionSets = function _EntraAppRoleAssignmentRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
-export default new AadAppRoleAssignmentRemoveCommand();
+export default new EntraAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map

package/dist/m365/entra/commands/group/group-add.js

@@ -0,0 +1,224 @@
+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 _EntraGroupAddCommand_instances, _EntraGroupAddCommand_initOptions, _EntraGroupAddCommand_initValidators, _EntraGroupAddCommand_initTelemetry;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import aadCommands from '../../aadCommands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+class EntraGroupAddCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_ADD;
+    }
+    get description() {
+        return 'Creates a Microsoft Entra group';
+    }
+    alias() {
+        return [aadCommands.GROUP_ADD];
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    constructor() {
+        super();
+        _EntraGroupAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        let group;
+        let ownerIds = [];
+        let memberIds = [];
+        try {
+            const manifest = this.createRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: manifest
+            };
+            ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
+            memberIds = await this.getUserIds(logger, args.options.memberIds, args.options.memberUserNames);
+            group = await request.post(requestOptions);
+            if (ownerIds.length !== 0) {
+                await this.addUsers(group.id, 'owners', ownerIds);
+            }
+            if (memberIds.length !== 0) {
+                await this.addUsers(group.id, 'members', memberIds);
+            }
+            await logger.log(group);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    ;
+    createRequestBody(options) {
+        const requestBody = {
+            displayName: options.displayName,
+            description: options.description,
+            mailNickName: options.mailNickname ?? this.generateMailNickname(),
+            visibility: options.visibility ?? 'Public',
+            groupTypes: options.type === 'microsoft365' ? ['Unified'] : [],
+            mailEnabled: options.type === 'security' ? false : true,
+            securityEnabled: true
+        };
+        this.addUnknownOptionsToPayload(requestBody, options);
+        return requestBody;
+    }
+    generateMailNickname() {
+        return `Group${Math.floor(Math.random() * 1000000)}`;
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return userIds.split(',').map(o => o.trim());
+        }
+        if (!userNames) {
+            if (this.verbose) {
+                await logger.logToStderr('No users to validate, skipping.');
+            }
+            return [];
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user information.');
+        }
+        const userArr = userNames.split(',').map(o => o.trim());
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving ID(s) of user(s)...');
+        }
+        return entraUser.getUserIdsByUpns(userArr);
+    }
+    async addUsers(groupId, role, userIds) {
+        for (let i = 0; i < userIds.length; i += 400) {
+            const userIdsBatch = userIds.slice(i, i + 400);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/$batch`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: []
+                }
+            };
+            // only 20 requests per one batch are allowed
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                // only 20 users can be added in one request
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+}
+_EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptions = function _EntraGroupAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-t, --type <type>',
+        autocomplete: ['microsoft365', 'security']
+    }, {
+        option: '-m, --mailNickname [mailNickname]'
+    }, {
+        option: '--ownerIds [ownerIds]'
+    }, {
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
+    }, {
+        option: '--visibility [visibility]',
+        autocomplete: ['Public', 'Private', 'HiddenMembership']
+    });
+}, _EntraGroupAddCommand_initValidators = function _EntraGroupAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.displayName.length > 256) {
+            return `The maximum amount of characters for 'displayName' is 256.`;
+        }
+        if (args.options.mailNickname) {
+            if (!validation.isValidMailNickname(args.options.mailNickname)) {
+                return `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \ [] " ; : <> , SPACE.`;
+            }
+            if (args.options.mailNickname.length > 64) {
+                return `The maximum amount of characters for 'mailNickname' is 64.`;
+            }
+        }
+        if (args.options.ownerIds) {
+            const ids = args.options.ownerIds.split(',').map(i => i.trim());
+            if (!validation.isValidGuidArray(ids)) {
+                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
+                return `'${invalidGuid}' is not a valid GUID for option 'ownerIds'.`;
+            }
+        }
+        if (args.options.ownerUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'ownerUserNames'.`;
+            }
+        }
+        if (args.options.memberIds) {
+            const ids = args.options.memberIds.split(',').map(i => i.trim());
+            if (!validation.isValidGuidArray(ids)) {
+                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
+                return `'${invalidGuid}' is not a valid GUID for option 'memberIds'.`;
+            }
+        }
+        if (args.options.memberUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.memberUserNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'memberUserNames'.`;
+            }
+        }
+        if (['microsoft365', 'security'].indexOf(args.options.type) === -1) {
+            return `Option 'type' must be one of the following values: microsoft365, security.`;
+        }
+        if (args.options.type === 'microsoft365' && !args.options.visibility) {
+            return `Option 'visibility' must be specified if the option 'type' is set to microsoft365`;
+        }
+        if (args.options.visibility && ['Public', 'Private', 'HiddenMembership'].indexOf(args.options.visibility) === -1) {
+            return `Option 'visibility' must be one of the following values: Public, Private, HiddenMembership.`;
+        }
+        return true;
+    });
+}, _EntraGroupAddCommand_initTelemetry = function _EntraGroupAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            type: typeof args.options.type !== 'undefined',
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
+            visibility: typeof args.options.visibility !== 'undefined'
+        });
+    });
+};
+export default new EntraGroupAddCommand();
+//# sourceMappingURL=group-add.js.map

package/dist/m365/{aad → entra}/commands/group/group-get.js

@@ -3,34 +3,38 @@ 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 _AadGroupGetCommand_instances, _AadGroupGetCommand_initOptions, _AadGroupGetCommand_initValidators, _AadGroupGetCommand_initOptionSets, _AadGroupGetCommand_initTelemetry;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+var _EntraGroupGetCommand_instances, _EntraGroupGetCommand_initOptions, _EntraGroupGetCommand_initValidators, _EntraGroupGetCommand_initOptionSets, _EntraGroupGetCommand_initTelemetry;
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadGroupGetCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraGroupGetCommand extends GraphCommand {
     get name() {
         return commands.GROUP_GET;
     }
     get description() {
-        return 'Gets information about the specified Azure AD Group';
+        return 'Gets information about the specified Entra group';
+    }
+    alias() {
+        return [aadCommands.GROUP_GET];
     }
     constructor() {
         super();
-        _AadGroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadGroupGetCommand_instances, "m", _AadGroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadGroupGetCommand_instances, "m", _AadGroupGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadGroupGetCommand_instances, "m", _AadGroupGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _AadGroupGetCommand_instances, "m", _AadGroupGetCommand_initTelemetry).call(this);
+        _EntraGroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupGetCommand_instances, "m", _EntraGroupGetCommand_initTelemetry).call(this);
     }
     async commandAction(logger, args) {
         let group;
         try {
             if (args.options.id) {
-                group = await aadGroup.getGroupById(args.options.id);
+                group = await entraGroup.getGroupById(args.options.id);
             }
             else {
-                group = await aadGroup.getGroupByDisplayName(args.options.displayName);
+                group = await entraGroup.getGroupByDisplayName(args.options.displayName);
             }
             await logger.log(group);
         }
@@ -39,22 +43,22 @@ class AadGroupGetCommand extends GraphCommand {
         }
     }
 }
-_AadGroupGetCommand_instances = new WeakSet(), _AadGroupGetCommand_initOptions = function _AadGroupGetCommand_initOptions() {
+_EntraGroupGetCommand_instances = new WeakSet(), _EntraGroupGetCommand_initOptions = function _EntraGroupGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
     });
-}, _AadGroupGetCommand_initValidators = function _AadGroupGetCommand_initValidators() {
+}, _EntraGroupGetCommand_initValidators = function _EntraGroupGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
-}, _AadGroupGetCommand_initOptionSets = function _AadGroupGetCommand_initOptionSets() {
+}, _EntraGroupGetCommand_initOptionSets = function _EntraGroupGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'displayName'] });
-}, _AadGroupGetCommand_initTelemetry = function _AadGroupGetCommand_initTelemetry() {
+}, _EntraGroupGetCommand_initTelemetry = function _EntraGroupGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -62,5 +66,5 @@ _AadGroupGetCommand_instances = new WeakSet(), _AadGroupGetCommand_initOptions =
         });
     });
 };
-export default new AadGroupGetCommand();
+export default new EntraGroupGetCommand();
 //# sourceMappingURL=group-get.js.map

package/dist/m365/{aad → entra}/commands/group/group-list.js

@@ -3,27 +3,31 @@ 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 _AadGroupListCommand_instances, _a, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions, _AadGroupListCommand_initValidators;
+var _EntraGroupListCommand_instances, _a, _EntraGroupListCommand_initTelemetry, _EntraGroupListCommand_initOptions, _EntraGroupListCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadGroupListCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraGroupListCommand extends GraphCommand {
     get name() {
         return commands.GROUP_LIST;
     }
     get description() {
-        return 'Lists all groups defined in Azure Active Directory.';
+        return 'Lists all groups defined in Entra ID.';
+    }
+    alias() {
+        return [aadCommands.GROUP_LIST];
     }
     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);
+        _EntraGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupListCommand_instances, "m", _EntraGroupListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -86,18 +90,18 @@ class AadGroupListCommand extends GraphCommand {
         }
     }
 }
-_a = AadGroupListCommand, _AadGroupListCommand_instances = new WeakSet(), _AadGroupListCommand_initTelemetry = function _AadGroupListCommand_initTelemetry() {
+_a = EntraGroupListCommand, _EntraGroupListCommand_instances = new WeakSet(), _EntraGroupListCommand_initTelemetry = function _EntraGroupListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             type: typeof args.options.type !== 'undefined'
         });
     });
-}, _AadGroupListCommand_initOptions = function _AadGroupListCommand_initOptions() {
+}, _EntraGroupListCommand_initOptions = function _EntraGroupListCommand_initOptions() {
     this.options.unshift({
         option: '--type [type]',
         autocomplete: _a.groupTypes
     });
-}, _AadGroupListCommand_initValidators = function _AadGroupListCommand_initValidators() {
+}, _EntraGroupListCommand_initValidators = function _EntraGroupListCommand_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.`;
@@ -105,6 +109,6 @@ _a = AadGroupListCommand, _AadGroupListCommand_instances = new WeakSet(), _AadGr
         return true;
     });
 };
-AadGroupListCommand.groupTypes = ['microsoft365', 'security', 'distribution', 'mailEnabledSecurity'];
-export default new AadGroupListCommand();
+EntraGroupListCommand.groupTypes = ['microsoft365', 'security', 'distribution', 'mailEnabledSecurity'];
+export default new EntraGroupListCommand();
 //# sourceMappingURL=group-list.js.map

package/dist/m365/{aad → entra}/commands/group/group-remove.js

@@ -3,28 +3,32 @@ 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 _AadGroupRemoveCommand_instances, _AadGroupRemoveCommand_initTelemetry, _AadGroupRemoveCommand_initOptions, _AadGroupRemoveCommand_initOptionSets, _AadGroupRemoveCommand_initValidators, _AadGroupRemoveCommand_initTypes;
+var _EntraGroupRemoveCommand_instances, _EntraGroupRemoveCommand_initTelemetry, _EntraGroupRemoveCommand_initOptions, _EntraGroupRemoveCommand_initOptionSets, _EntraGroupRemoveCommand_initValidators, _EntraGroupRemoveCommand_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 { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
-class AadGroupRemoveCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraGroupRemoveCommand extends GraphCommand {
     get name() {
         return commands.GROUP_REMOVE;
     }
     get description() {
-        return 'Removes an Azure AD group';
+        return 'Removes an Entra group';
+    }
+    alias() {
+        return [aadCommands.GROUP_REMOVE];
     }
     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);
+        _EntraGroupRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupRemoveCommand_instances, "m", _EntraGroupRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -34,7 +38,7 @@ class AadGroupRemoveCommand extends GraphCommand {
             try {
                 let groupId = args.options.id;
                 if (args.options.displayName) {
-                    groupId = await aadGroup.getGroupIdByDisplayName(args.options.displayName);
+                    groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
                 }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${groupId}`,
@@ -59,7 +63,7 @@ class AadGroupRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadGroupRemoveCommand_instances = new WeakSet(), _AadGroupRemoveCommand_initTelemetry = function _AadGroupRemoveCommand_initTelemetry() {
+_EntraGroupRemoveCommand_instances = new WeakSet(), _EntraGroupRemoveCommand_initTelemetry = function _EntraGroupRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: args.options.id !== 'undefined',
@@ -67,7 +71,7 @@ _AadGroupRemoveCommand_instances = new WeakSet(), _AadGroupRemoveCommand_initTel
             force: !!args.options.force
         });
     });
-}, _AadGroupRemoveCommand_initOptions = function _AadGroupRemoveCommand_initOptions() {
+}, _EntraGroupRemoveCommand_initOptions = function _EntraGroupRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
@@ -75,19 +79,19 @@ _AadGroupRemoveCommand_instances = new WeakSet(), _AadGroupRemoveCommand_initTel
     }, {
         option: '-f, --force'
     });
-}, _AadGroupRemoveCommand_initOptionSets = function _AadGroupRemoveCommand_initOptionSets() {
+}, _EntraGroupRemoveCommand_initOptionSets = function _EntraGroupRemoveCommand_initOptionSets() {
     this.optionSets.push({
         options: ['id', 'displayName']
     });
-}, _AadGroupRemoveCommand_initValidators = function _AadGroupRemoveCommand_initValidators() {
+}, _EntraGroupRemoveCommand_initValidators = function _EntraGroupRemoveCommand_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() {
+}, _EntraGroupRemoveCommand_initTypes = function _EntraGroupRemoveCommand_initTypes() {
     this.types.string.push('id', 'displayName');
 };
-export default new AadGroupRemoveCommand();
+export default new EntraGroupRemoveCommand();
 //# sourceMappingURL=group-remove.js.map