@pnp/cli-microsoft365 7.4.0 → 7.5.0-beta.d4d820f

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

@@ -1,5 +1,5 @@
 import { cli } from '../../../cli/cli.js';
-import aadAppGetCommand from '../../entra/commands/app/app-get.js';
+import entraAppGetCommand from '../../entra/commands/app/app-get.js';
 import AppCommand from '../../base/AppCommand.js';
 import commands from '../commands.js';
 class AppGetCommand extends AppCommand {
@@ -17,7 +17,7 @@ class AppGetCommand extends AppCommand {
             verbose: args.options.verbose
         };
         try {
-            const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
+            const appGetOutput = await cli.executeCommandWithOutput(entraAppGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(appGetOutput.stderr);
             }

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -8,7 +8,7 @@ import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
+import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
 import aadCommands from "../../aadCommands.js";
 class EntraAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
@@ -36,7 +36,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
                 administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
             }
             else {
-                administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+                administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
             }
             await logger.log(administrativeUnit);
         }

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-add.js

@@ -4,14 +4,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAdministrativeUnitMemberAddCommand_instances, _EntraAdministrativeUnitMemberAddCommand_initTelemetry, _EntraAdministrativeUnitMemberAddCommand_initOptions, _EntraAdministrativeUnitMemberAddCommand_initValidators, _EntraAdministrativeUnitMemberAddCommand_initOptionSets;
-import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
-import { aadGroup } from "../../../../utils/aadGroup.js";
-import { aadUser } from "../../../../utils/aadUser.js";
+import { entraAdministrativeUnit } from "../../../../utils/entraAdministrativeUnit.js";
+import { entraGroup } from "../../../../utils/entraGroup.js";
+import { entraUser } from "../../../../utils/entraUser.js";
 import { validation } from "../../../../utils/validation.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
 import request from "../../../../request.js";
-import { aadDevice } from "../../../../utils/aadDevice.js";
+import { entraDevice } from "../../../../utils/entraDevice.js";
 import aadCommands from "../../aadCommands.js";
 class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
     get name() {
@@ -40,7 +40,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Retrieving Administrative Unit Id...`);
                 }
-                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
             }
             if (args.options.userId || args.options.userName) {
                 memberType = 'users';
@@ -49,7 +49,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Retrieving User Id...`);
                     }
-                    memberId = await aadUser.getUserIdByUpn(args.options.userName);
+                    memberId = await entraUser.getUserIdByUpn(args.options.userName);
                 }
             }
             else if (args.options.groupId || args.options.groupName) {
@@ -59,7 +59,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Retrieving Group Id...`);
                     }
-                    memberId = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    memberId = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
             }
             else if (args.options.deviceId || args.options.deviceName) {
@@ -69,7 +69,7 @@ class EntraAdministrativeUnitMemberAddCommand extends GraphCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Device with name ${args.options.deviceName} retrieved, returned id: ${memberId}`);
                     }
-                    memberId = (await aadDevice.getDeviceByDisplayName(args.options.deviceName)).id;
+                    memberId = (await entraDevice.getDeviceByDisplayName(args.options.deviceName)).id;
                 }
             }
             const requestOptions = {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-get.js

@@ -7,7 +7,7 @@ var _EntraAdministrativeUnitMemberGetCommand_instances, _EntraAdministrativeUnit
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import request from '../../../../request.js';
 import aadCommands from '../../aadCommands.js';
 class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitMemberGetCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Retrieving Administrative Unit Id...`);
                 }
-                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
             }
             const url = this.getRequestUrl(administrativeUnitId, args.options.id, args.options);
             const requestOptions = {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-member-list.js

@@ -7,7 +7,7 @@ var _EntraAdministrativeUnitMemberListCommand_instances, _EntraAdministrativeUni
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { validation } from '../../../../utils/validation.js';
 import aadCommands from '../../aadCommands.js';
 class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitMemberListCommand extends GraphCommand {
         let administrativeUnitId = args.options.administrativeUnitId;
         try {
             if (args.options.administrativeUnitName) {
-                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
             }
             let results;
             const endpoint = this.getRequestUrl(administrativeUnitId, args.options);

package/dist/m365/entra/commands/administrativeunit/administrativeunit-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 _EntraAdministrativeUnitRemoveCommand_instances, _EntraAdministrativeUnitRemoveCommand_initTelemetry, _EntraAdministrativeUnitRemoveCommand_initOptions, _EntraAdministrativeUnitRemoveCommand_initOptionSets, _EntraAdministrativeUnitRemoveCommand_initValidators, _EntraAdministrativeUnitRemoveCommand_initTypes;
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
 import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
@@ -35,7 +35,7 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
             try {
                 let administrativeUnitId = args.options.id;
                 if (args.options.displayName) {
-                    const administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+                    const administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
                     administrativeUnitId = administrativeUnit.id;
                 }
                 const requestOptions = {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.js

@@ -4,8 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
-import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraAdministrativeUnit } from '../../../../utils/entraAdministrativeUnit.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { roleAssignment } from '../../../../utils/roleAssignment.js';
 import { roleDefinition } from '../../../../utils/roleDefinition.js';
 import { validation } from '../../../../utils/validation.js';
@@ -33,7 +33,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Retrieving administrative unit by its name '${args.options.administrativeUnitName}'`);
                 }
-                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+                administrativeUnitId = (await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
             }
             if (args.options.roleDefinitionName) {
                 if (this.verbose) {
@@ -45,7 +45,7 @@ class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
                 if (this.verbose) {
                     await logger.logToStderr(`Retrieving user by UPN '${args.options.userName}'`);
                 }
-                userId = await aadUser.getUserIdByUpn(args.options.userName);
+                userId = await entraUser.getUserIdByUpn(args.options.userName);
             }
             const unifiedRoleAssignment = await roleAssignment.createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId, userId, administrativeUnitId);
             await logger.log(unifiedRoleAssignment);

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

@@ -67,13 +67,9 @@ class EntraAppPermissionAddCommand extends GraphCommand {
         }
     }
     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`);
-        }
+        const apps = options.appObjectId
+            ? await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=id eq '${options.appObjectId}'&$select=id,appId,requiredResourceAccess`)
+            : await odata.getAllItems(`${this.resource}/v1.0/applications?$filter=appId eq '${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)`;
         }

package/dist/m365/entra/commands/group/group-get.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 _EntraGroupGetCommand_instances, _EntraGroupGetCommand_initOptions, _EntraGroupGetCommand_initValidators, _EntraGroupGetCommand_initOptionSets, _EntraGroupGetCommand_initTelemetry;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -31,10 +31,10 @@ class EntraGroupGetCommand extends GraphCommand {
         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);
         }

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

@@ -8,7 +8,7 @@ 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';
 import aadCommands from '../../aadCommands.js';
 class EntraGroupRemoveCommand extends GraphCommand {
@@ -38,7 +38,7 @@ class EntraGroupRemoveCommand 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}`,

package/dist/m365/entra/commands/group/group-user-list.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 _EntraGroupUserListCommand_instances, _EntraGroupUserListCommand_initTelemetry, _EntraGroupUserListCommand_initOptions, _EntraGroupUserListCommand_initOptionSets, _EntraGroupUserListCommand_initValidators;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -64,7 +64,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;

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

@@ -8,7 +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';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupConversationListCommand extends GraphCommand {
     get name() {
@@ -31,7 +31,7 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
             }

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.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 _EntraM365GroupConversationPostListCommand_instances, _EntraM365GroupConversationPostListCommand_initTelemetry, _EntraM365GroupConversationPostListCommand_initOptions, _EntraM365GroupConversationPostListCommand_initValidators, _EntraM365GroupConversationPostListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -35,7 +35,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const retrievedgroupId = await this.getGroupId(args);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(retrievedgroupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(retrievedgroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${retrievedgroupId}' is not a Microsoft 365 group.`);
             }
@@ -50,7 +50,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -29,11 +29,11 @@ class EntraM365GroupGetCommand extends GraphCommand {
     async commandAction(logger, args) {
         let group;
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.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);
+            group = await entraGroup.getGroupById(args.options.id);
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -39,7 +39,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
                 await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
             }
             try {
-                const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
                 }

package/dist/m365/entra/commands/m365group/m365group-renew.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -31,7 +31,7 @@ class EntraM365GroupRenewCommand extends GraphCommand {
             await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
         }
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }

package/dist/m365/entra/commands/m365group/m365group-set.js

@@ -11,7 +11,7 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
@@ -34,7 +34,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -56,7 +56,7 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = await this.getGroupId(args.options);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }

package/dist/m365/entra/commands/m365group/m365group-user-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -33,7 +33,7 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(providedGroupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
             }

package/dist/m365/entra/commands/m365group/m365group-user-list.js

@@ -8,7 +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';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserListCommand extends GraphCommand {
     get name() {
@@ -34,7 +34,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
             }
             const groupId = await this.getGroupId(args.options, logger);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group '${args.options.groupId || args.options.groupDisplayName}' is not a Microsoft 365 group.`);
             }
@@ -71,7 +71,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;

package/dist/m365/entra/commands/m365group/m365group-user-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = async () => {
             try {
-                const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }

package/dist/m365/entra/commands/m365group/m365group-user-set.js

@@ -10,7 +10,7 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
@@ -33,7 +33,7 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -5,8 +5,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowOwnerEnsureCommand_instances, _a, _FlowOwnerEnsureCommand_initTelemetry, _FlowOwnerEnsureCommand_initOptions, _FlowOwnerEnsureCommand_initOptionSets, _FlowOwnerEnsureCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -36,13 +36,13 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
                 id = args.options.userId;
             }
             else if (args.options.userName) {
-                id = await aadUser.getUserIdByUpn(args.options.userName);
+                id = await entraUser.getUserIdByUpn(args.options.userName);
             }
             else if (args.options.groupId) {
                 id = args.options.groupId;
             }
             else {
-                id = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                id = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
             }
             let type;
             if (args.options.userId || args.options.userName) {

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -6,8 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowOwnerRemoveCommand_instances, _FlowOwnerRemoveCommand_initTelemetry, _FlowOwnerRemoveCommand_initOptions, _FlowOwnerRemoveCommand_initValidators, _FlowOwnerRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
@@ -38,13 +38,13 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
                     idToRemove = args.options.userId;
                 }
                 else if (args.options.userName) {
-                    idToRemove = await aadUser.getUserIdByUpn(args.options.userName);
+                    idToRemove = await entraUser.getUserIdByUpn(args.options.userName);
                 }
                 else if (args.options.groupId) {
                     idToRemove = args.options.groupId;
                 }
                 else {
-                    idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                    idToRemove = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
                     url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -54,7 +54,7 @@ class OneNoteNotebookListCommand extends GraphCommand {
         return endpoint;
     }
     async getGroupId(groupName) {
-        const group = await aadGroup.getGroupByDisplayName(groupName);
+        const group = await entraGroup.getGroupByDisplayName(groupName);
         return group.id;
     }
     async getSpoSiteId(webUrl) {

package/dist/m365/onenote/commands/page/page-list.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 _OneNotePageListCommand_instances, _OneNotePageListCommand_initTelemetry, _OneNotePageListCommand_initOptions, _OneNotePageListCommand_initValidators, _OneNotePageListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -54,7 +54,7 @@ class OneNotePageListCommand extends GraphCommand {
         return endpoint;
     }
     async getGroupId(groupName) {
-        const group = await aadGroup.getGroupByDisplayName(groupName);
+        const group = await entraGroup.getGroupByDisplayName(groupName);
         return group.id;
     }
     async commandAction(logger, args) {

package/dist/m365/pa/commands/app/app-owner-set.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppOwnerSetCommand_instances, _a, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerAppsCommand from '../../../base/PowerAppsCommand.js';
 import commands from '../../commands.js';
@@ -52,7 +52,7 @@ class PaAppOwnerSetCommand extends PowerAppsCommand {
         if (options.userId) {
             return options.userId;
         }
-        return aadUser.getUserIdByUpn(options.userName);
+        return entraUser.getUserIdByUpn(options.userName);
     }
 }
 _a = PaAppOwnerSetCommand, _PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {