@pnp/cli-microsoft365 7.4.0-beta.fce7b64 → 7.5.0-beta.23612bc

package/dist/m365/teams/commands/meeting/meeting-add.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingAddCommand_instances, _TeamsMeetingAddCommand_initTelemetry, _TeamsMeetingAddCommand_initOptions, _TeamsMeetingAddCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from "../../../base/GraphCommand.js";
@@ -53,7 +53,7 @@ class TeamsMeetingAddCommand extends GraphCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving Organizer Id...`);
             }
-            const organizerId = await aadUser.getUserIdByEmail(options.organizerEmail);
+            const organizerId = await entraUser.getUserIdByEmail(options.organizerEmail);
             requestUrl = `${this.resource}/v1.0/users/${organizerId}`;
         }
         if (this.verbose) {

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -9,7 +9,7 @@ import { cli } from '../../../../cli/cli.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import entraUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
 class TeamsMeetingAttendancereportListCommand extends GraphCommand {
@@ -71,7 +71,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await cli.executeCommandWithOutput(aadUserGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(entraUserGetCommand, { options: { ...options, _: [] } });
         const getUserOutput = JSON.parse(output.stdout);
         return getUserOutput.id;
     }

package/dist/m365/teams/commands/meeting/meeting-get.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 import auth from '../../../../Auth.js';
 import request from '../../../../request.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -76,9 +76,9 @@ class TeamsMeetingGetCommand extends GraphCommand {
             return options.userId;
         }
         if (options.userName) {
-            return aadUser.getUserIdByUpn(options.userName);
+            return entraUser.getUserIdByUpn(options.userName);
         }
-        return aadUser.getUserIdByEmail(options.email);
+        return entraUser.getUserIdByEmail(options.email);
     }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingListCommand_instances, _TeamsMeetingListCommand_initTelemetry, _TeamsMeetingListCommand_initOptions, _TeamsMeetingListCommand_initValidators;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand {
             requestUrl += `users/${options.userId || options.userName}`;
         }
         else if (options.email) {
-            const userId = await aadUser.getUserIdByEmail(options.email);
+            const userId = await entraUser.getUserIdByEmail(options.email);
             requestUrl += `users/${userId}`;
         }
         else {

package/dist/m365/teams/commands/meeting/meeting-transcript-list.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMeetingTranscriptListCommand_instances, _TeamsMeetingTranscriptListCommand_initTelemetry, _TeamsMeetingTranscriptListCommand_initOptions, _TeamsMeetingTranscriptListCommand_initValidators, _TeamsMeetingTranscriptListCommand_initOptionSets;
 import auth from '../../../../Auth.js';
-import { aadUser } from '../../../../utils/aadUser.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -51,7 +51,7 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand {
                     if (this.verbose) {
                         await logger.logToStderr(`Getting user ID for user with email '${args.options.email}'.`);
                     }
-                    const userId = await aadUser.getUserIdByEmail(args.options.email);
+                    const userId = await entraUser.getUserIdByEmail(args.options.email);
                     requestUrl += userId;
                 }
             }

package/dist/m365/teams/commands/tab/tab-get.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators, _TeamsTabGetCommand_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';
@@ -31,7 +31,7 @@ class TeamsTabGetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.teamName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/team/team-add.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initOptionSets;
 import { setTimeout } from 'timers/promises';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsTeamAddCommand extends GraphCommand {
@@ -77,8 +77,8 @@ class TeamsTeamAddCommand extends GraphCommand {
             }
             else {
                 await this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
-                const aadGroup = await this.getAadGroup(teamsAsyncOperation.targetResourceId, logger);
-                await logger.log(aadGroup);
+                const entraGroup = await this.getEntraGroup(teamsAsyncOperation.targetResourceId, logger);
+                await logger.log(entraGroup);
             }
         }
         catch (err) {
@@ -104,17 +104,17 @@ class TeamsTeamAddCommand extends GraphCommand {
             await this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
         }
     }
-    async getAadGroup(id, logger) {
+    async getEntraGroup(id, logger) {
         let group;
         try {
-            group = await aadGroup.getGroupById(id);
+            group = await entraGroup.getGroupById(id);
         }
         catch {
             if (this.verbose) {
                 await logger.logToStderr(`Error occurred on retrieving the aad group. Retrying in ${this.pollingInterval / 1000} seconds.`);
             }
             await setTimeout(this.pollingInterval);
-            return await this.getAadGroup(id, logger);
+            return await this.getEntraGroup(id, logger);
         }
         return group;
     }

package/dist/m365/teams/commands/team/team-archive.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators, _TeamsTeamArchiveCommand_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';
@@ -29,7 +29,7 @@ class TeamsTeamArchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/team/team-get.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators, _TeamsTeamGetCommand_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';
@@ -29,7 +29,7 @@ class TeamsTeamGetCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/team/team-remove.js

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_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';
@@ -30,7 +30,7 @@ class TeamsTeamRemoveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw `The specified team does not exist in the Microsoft Teams`;
         }

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initValidators, _TeamsTeamUnarchiveCommand_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';
@@ -28,7 +28,7 @@ class TeamsTeamUnarchiveCommand extends GraphCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.name);
+        const group = await entraGroup.getGroupByDisplayName(args.options.name);
         if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
             throw 'The specified team does not exist in the Microsoft Teams';
         }

package/dist/m365/teams/commands/user/user-app-add.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,8 +26,12 @@ class TeamsUserAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const appId = await this.getAppId(args);
         const userId = (args.options.userId ?? args.options.userName);
         const endpoint = `${this.resource}/v1.0`;
+        if (this.verbose) {
+            await logger.logToStderr(`Removing app with ID ${appId} for user ${args.options.userId}`);
+        }
         const requestOptions = {
             url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
             headers: {
@@ -35,7 +40,7 @@ class TeamsUserAppAddCommand extends GraphCommand {
             },
             responseType: 'json',
             data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.id}`
+                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
             }
         };
         try {
@@ -45,17 +50,43 @@ class TeamsUserAppAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getAppId(args) {
+        if (args.options.id) {
+            return args.options.id;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.value.length === 1) {
+            return response.value[0].id;
+        }
+        if (response.value.length === 0) {
+            throw `The specified Teams app does not exist`;
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+        const result = (await cli.handleMultipleResultsFound(`Multiple Teams apps with name '${args.options.name}' found.`, resultAsKeyValuePair));
+        return result.id;
+    }
 }
 _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--id <id>'
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
     }, {
         option: '--userId [userId]'
     }, {
@@ -63,7 +94,7 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initT
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
@@ -75,6 +106,7 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initT
         return true;
     });
 }, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
     this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppAddCommand();

package/dist/request.js

@@ -154,6 +154,10 @@ class Request {
                         options.headers.authorization = `Bearer ${accessToken}`;
                     }
                 }
+                const proxyUrl = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+                if (proxyUrl) {
+                    options.proxy = this.createProxyConfigFromUrl(proxyUrl);
+                }
                 return this.req(options);
             })
                 .then((res) => {
@@ -199,6 +203,18 @@ class Request {
         const cloudUrl = Auth.getEndpointForResource(hostname, cloudType);
         options.url = options.url.replace(hostname, cloudUrl);
     }
+    createProxyConfigFromUrl(url) {
+        const parsedUrl = new URL(url);
+        const port = parsedUrl.port || (url.toLowerCase().startsWith('https') ? 443 : 80);
+        let authObject = null;
+        if (parsedUrl.username && parsedUrl.password) {
+            authObject = {
+                username: parsedUrl.username,
+                password: parsedUrl.password
+            };
+        }
+        return { host: parsedUrl.hostname, port: Number(port), protocol: 'http', ...(authObject && { auth: authObject }) };
+    }
 }
 export default new Request();
 //# sourceMappingURL=request.js.map

package/dist/utils/{aadAdministrativeUnit.js → entraAdministrativeUnit.js}

@@ -1,7 +1,7 @@
 import { odata } from './odata.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
-export const aadAdministrativeUnit = {
+export const entraAdministrativeUnit = {
     /**
      * Get an administrative unit by its display name.
      * @param displayName Administrative unit display name.
@@ -22,4 +22,4 @@ export const aadAdministrativeUnit = {
         return administrativeUnits[0];
     }
 };
-//# sourceMappingURL=aadAdministrativeUnit.js.map
+//# sourceMappingURL=entraAdministrativeUnit.js.map

package/dist/utils/{aadDevice.js → entraDevice.js}

@@ -2,7 +2,7 @@ import { odata } from "./odata.js";
 import { formatting } from "./formatting.js";
 import { cli } from "../cli/cli.js";
 const graphResource = 'https://graph.microsoft.com';
-export const aadDevice = {
+export const entraDevice = {
     /**
      * Get a device by its display name.
      * @param displayName Device display name.
@@ -22,4 +22,4 @@ export const aadDevice = {
         return devices[0];
     }
 };
-//# sourceMappingURL=aadDevice.js.map
+//# sourceMappingURL=entraDevice.js.map

package/dist/utils/{aadGroup.js → entraGroup.js}

@@ -3,7 +3,7 @@ import { formatting } from "./formatting.js";
 import { odata } from "./odata.js";
 import { cli } from '../cli/cli.js';
 const graphResource = 'https://graph.microsoft.com';
-export const aadGroup = {
+export const entraGroup = {
     /**
      * Retrieve a single group.
      * @param id Group ID.
@@ -95,4 +95,4 @@ export const aadGroup = {
         return group.groupTypes.some(type => type === 'Unified');
     }
 };
-//# sourceMappingURL=aadGroup.js.map
+//# sourceMappingURL=entraGroup.js.map

package/dist/utils/{aadUser.js → entraUser.js}

@@ -1,7 +1,7 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 const graphResource = 'https://graph.microsoft.com';
-export const aadUser = {
+export const entraUser = {
     /**
      * Retrieve the id of a user by its UPN.
      * @param upn User UPN.
@@ -20,6 +20,42 @@ export const aadUser = {
         }
         return res.value[0].id;
     },
+    /**
+     * Retrieve the IDs of users by their UPNs. There is no guarantee that the order of the returned IDs will match the order of the specified UPNs.
+     * @param upns Array of user UPNs.
+     * @returns Array of user IDs.
+     */
+    async getUserIdsByUpns(upns) {
+        const userIds = [];
+        for (let i = 0; i < upns.length; i += 20) {
+            const upnsChunk = upns.slice(i, i + 20);
+            const requestOptions = {
+                url: `${graphResource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: upnsChunk.map((upn, index) => ({
+                        id: index + 1,
+                        method: 'GET',
+                        url: `/users/${formatting.encodeQueryParameter(upn)}?$select=id`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        }
+                    }))
+                }
+            };
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 200) {
+                    throw Error(`The specified user with user name '${upnsChunk[response.id - 1]}' does not exist.`);
+                }
+                userIds.push(response.body.id);
+            }
+        }
+        return userIds;
+    },
     /**
     * Retrieve the ID of a user by its email.
     * @param mail User email.
@@ -54,4 +90,4 @@ export const aadUser = {
         return res.userPrincipalName;
     }
 };
-//# sourceMappingURL=aadUser.js.map
+//# sourceMappingURL=entraUser.js.map

package/dist/utils/md.js

@@ -13,8 +13,8 @@ function convertHeadings(md) {
     });
 }
 function convertAdmonitions(md) {
-    const regex = new RegExp(/^:::(\w+)([\s\S]*?):::$/, 'gm');
-    return md.replace(regex, (_, label, content) => label.toLocaleUpperCase() + EOL + EOL + content.trim());
+    const regex = new RegExp(/^:::(\w+)(?:\[([^\]]+)\])?([\s\S]*?):::$/, 'gm');
+    return md.replace(regex, (_, label, title, content) => label.toLocaleUpperCase() + (title ? EOL + EOL + title : '') + EOL + EOL + content.trim());
 }
 function includeContent(md, rootFolder) {
     const mdxImports = [

package/dist/utils/roleAssignment.js

@@ -0,0 +1,42 @@
+import request from '../request.js';
+const getRequestOptions = (roleDefinitionId, principalId, directoryScopeId) => ({
+    url: `https://graph.microsoft.com/v1.0/roleManagement/directory/roleAssignments`,
+    headers: {
+        accept: 'application/json;odata.metadata=none'
+    },
+    responseType: 'json',
+    data: {
+        roleDefinitionId: roleDefinitionId,
+        principalId: principalId,
+        directoryScopeId: directoryScopeId
+    }
+});
+/**
+ * Utils for RBAC.
+ * Supported RBAC providers:
+ *  - Directory (Entra ID)
+ */
+export const roleAssignment = {
+    /**
+     * Assigns a specific role to a principal with scope to an administrative unit
+     * @param roleDefinitionId Role which lists the actions that can be performed
+     * @param principalId Object that represents a user, group, service principal, or managed identity that is requesting access to resources
+     * @param administrativeUnitId Administrative unit which represents a current scope for a role assignment
+     * @returns Returns unified role assignment object that represents a role definition assigned to a principal with scope to an administrative unit
+     */
+    async createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId, principalId, administrativeUnitId) {
+        const requestOptions = getRequestOptions(roleDefinitionId, principalId, `/administrativeUnits/${administrativeUnitId}`);
+        return await request.post(requestOptions);
+    },
+    /**
+     * Assigns a specific role to a principal with scope to the whole tenant
+     * @param roleDefinitionId Role which lists the actions that can be performed
+     * @param principalId Object that represents a user, group, service principal, or managed identity that is requesting access to resources
+     * @returns Returns unified role assignment object that represents a role definition assigned to a principal with scope to the whole tenant
+     */
+    async createRoleAssignmentWithTenantScope(roleDefinitionId, principalId) {
+        const requestOptions = getRequestOptions(roleDefinitionId, principalId, '/');
+        return await request.post(requestOptions);
+    }
+};
+//# sourceMappingURL=roleAssignment.js.map

package/dist/utils/roleDefinition.js

@@ -0,0 +1,24 @@
+import { cli } from '../cli/cli.js';
+import { formatting } from './formatting.js';
+import { odata } from './odata.js';
+export const roleDefinition = {
+    /**
+     * Get a directory (Microsoft Entra) role
+     * @param displayName Role definition display name.
+     * @returns The role definition.
+     * @throws Error when role definition was not found.
+     */
+    async getRoleDefinitionByDisplayName(displayName) {
+        const roleDefinitions = await odata.getAllItems(`https://graph.microsoft.com/v1.0/roleManagement/directory/roleDefinitions?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (roleDefinitions.length === 0) {
+            throw `The specified role definition '${displayName}' does not exist.`;
+        }
+        if (roleDefinitions.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', roleDefinitions);
+            const selectedRoleDefinition = await cli.handleMultipleResultsFound(`Multiple role definitions with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedRoleDefinition;
+        }
+        return roleDefinitions[0];
+    }
+};
+//# sourceMappingURL=roleDefinition.js.map

package/dist/utils/spo.js

@@ -8,7 +8,7 @@ import request from "../request.js";
 import { formatting } from './formatting.js';
 import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
-import { aadGroup } from './aadGroup.js';
+import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
 export const spo = {
     getRequestDigest(siteUrl) {
@@ -996,7 +996,7 @@ export const spo = {
                     promises.push(request.post(requestOptions));
                 }
                 if (typeof isPublic !== 'undefined') {
-                    promises.push(aadGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                    promises.push(entraGroup.setGroup(groupId, (isPublic === false), logger, verbose));
                 }
                 if (typeof owners !== 'undefined') {
                     promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));

package/dist/utils/validation.js

@@ -21,6 +21,10 @@ export const validation = {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+(@thread\.v2|@unq\.gbl\.spaces)$/i);
         return guidRegEx.test(guid);
     },
+    isValidUserPrincipalNameArray(upns) {
+        const invalidGuid = upns.find(upn => !this.isValidUserPrincipalName(upn));
+        return invalidGuid || true;
+    },
     isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
         // verify if the upn is a valid upn. @meusername will be replaced in a later stage with the actual username of the logged in user

package/docs/docs/cmd/adaptivecard/adaptivecard-send.mdx

@@ -47,7 +47,7 @@ The predefined card is automatically adjusted based on which options have been s
 
 If your custom card is a card template (card with placeholders like `${title}`), you can fill it with data either by specifying the complete data object using the `cardData` option, or by passing any number of arbitrary options that will be mapped onto the card. The arbitrary properties should not match any of the global options like `output`, `query`, `debug`, etc. Data options like `title`, `description`, `imageUrl` and `actionUrl` will be mapped onto the card as well.
 
-:::warning Escaping JSON in PowerShell
+:::warning[Escaping JSON in PowerShell]
 
 When using the `--card` and `--cardData` options it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../user-guide/using-cli.mdx#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../user-guide/using-cli.mdx#passing-complex-content-into-cli-options) instead.
 

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-add.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit add
+# entra administrativeunit add
 
 Creates a new administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit add [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit add [options]
 ```
@@ -40,19 +46,19 @@ To use this command you must be either **Global Administrator** or **Privileged
 Create an administrative unit with a specific display name
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division'
+m365 entra administrativeunit add --displayName 'Marketing Division'
 ```
 
 Create an administrative unit with a specific display name and description
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division' --description 'Marketing department administration'
+m365 entra administrativeunit add --displayName 'Marketing Division' --description 'Marketing department administration'
 ```
 
 Create a hidden administrative unit with a specific display name
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division' --hiddenMembership
+m365 entra administrativeunit add --displayName 'Marketing Division' --hiddenMembership
 ```
 
 ## Response