@pnp/cli-microsoft365 7.4.0-beta.5c123d7 → 7.4.0-beta.8d6724f

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/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/docs/docs/cmd/entra/administrativeunit/administrativeunit-roleassignment-add.mdx

@@ -0,0 +1,116 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# entra administrativeunit roleassignment add
+
+Assigns a Microsoft Entra role with administrative unit scope to a user
+
+## Usage
+
+```sh
+m365 entra administrativeunit roleassignment add [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --administrativeUnitId [administrativeUnitId]`
+: The id of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`-n, --administrativeUnitName [administrativeUnitName]`
+: The name of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`--roleDefinitionId [roleDefinitionId]`
+: The id of the role definition that the member is in. Specify either `roleDefinitionId` or `roleDefinitionName`.
+
+`--roleDefinitionName [roleDefinitionName]`
+: The name of the role definition that the member is in. Specify either `roleDefinitionId` or `roleDefinitionName`.
+
+`--userId [userId]`
+: The id of the user that is a member of the scoped role. Specify either `userId` or `userName`.
+
+`--userName [userName]`
+: The name of the user that is a member of the scoped role. Specify either `userId` or `userName`.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Assign a role definition specified by id to a user specified by id for an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit roleassignment add --administrativeUnitId 81bb36e4-f4c6-4984-8e56-d4f8feae9e09 --roleDefinitionId 4d6ac14f-3453-41d0-bef9-a3e0c569773a --userId 5f91f951-7305-4a27-9b63-7b00906de09f
+```
+
+Assign a role definition specified by name to a user specified by name for an administrative unit specified by name
+
+```sh
+m365 entra administrativeunit roleassignment add --administrativeUnitName 'Marketing Division' --roleDefinitionName 'License Administrator' --userName 'john.doe@contoso.com'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "5wuT_mJe20eRr5jDpJo4sVH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2",
+    "principalId": "5f91f951-7305-4a27-9b63-7b00906de09f",
+    "directoryScopeId": "/administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09",
+    "roleDefinitionId": "4d6ac14f-3453-41d0-bef9-a3e0c569773a"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  directoryScopeId: /administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09
+  id              : 4yeYchSc90m7G5YI8Va7uFH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2
+  principalId     : 5f91f951-7305-4a27-9b63-7b00906de09f
+  roleDefinitionId: 4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,principalId,directoryScopeId,roleDefinitionId
+  UB-K8uf2cUWBi2oS8q9rbFH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2,5f91f951-7305-4a27-9b63-7b00906de09f,/administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09,4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # entra administrativeunit roleassignment add --administrativeUnitId "81bb36e4-f4c6-4984-8e56-d4f8feae9e09" --roleDefinitionId "4d6ac14f-3453-41d0-bef9-a3e0c569773a" --userId "5f91f951-7305-4a27-9b63-7b00906de09f"
+
+  Date: 11/16/2023
+
+  ## T8FqTVM00EG--aPgxWl3OlH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2
+
+  Property | Value
+  ---------|-------
+  id | T8FqTVM00EG--aPgxWl3OlH5kV8FcydKm2N7AJBt4J\_kNruBxvSESY5W1Pj-rp4J-2
+  principalId | 5f91f951-7305-4a27-9b63-7b00906de09f
+  directoryScopeId | /administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09
+  roleDefinitionId | 4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+</Tabs>
+
+## More information
+
+- [Roles with administrative unit scope](https://learn.microsoft.com/entra/identity/role-based-access-control/admin-units-assign-roles#roles-that-can-be-assigned-with-administrative-unit-scope)

package/docs/docs/cmd/external/connection/connection-urltoitemresolver-add.mdx

@@ -0,0 +1,47 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# external connection urltoitemresolver add
+
+Adds a URL to item resolver to an external connection
+
+## Usage
+
+```sh
+m365 external connection urltoitemresolver add [options]
+```
+
+## Options
+
+```md definition-list
+`-c, --externalConnectionId <externalConnectionId>`
+: The ID of the external connection to which to add the resolver
+
+`--baseUrls <baseUrls>`
+: Comma-separated list of base URLs
+
+`--urlPattern <urlPattern>`
+: Regex pattern to match URLs
+
+`-i, --itemId <itemId>`
+: Pattern that matches captured matches from the URL with the external item ID
+
+`-p, --priority <priority>`
+: Integer that defines the resolution order
+```
+<Global />
+
+## Examples
+
+Adds a URL to item resolver to an existing connection
+
+```sh
+m365 external connection urltoitemresolver add --externalConnectionId "samplesolutiongallery" --baseUrls "https://adoption.microsoft.com" --urlPattern "/sample-solution-gallery/sample/(?<sampleId>[^/]+)" --itemId "{sampleId}" --priority 1
+```
+
+## Response
+
+The command won't return a response on success.
+
+## More information
+
+- Microsoft Graph external connection activitySettings: [https://learn.microsoft.com/graph/api/resources/externalconnectors-activitysettings?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/externalconnectors-activitysettings?view=graph-rest-1.0)

package/docs/docs/cmd/flow/run/run-get.mdx

@@ -25,7 +25,14 @@ m365 flow run get [options]
 : The name of the environment where the flow is located
 
 `--includeTriggerInformation`
+: (deprecated. Use option `withTrigger` instead) If specified, include information about the trigger details
+
+`--withTrigger`
 : If specified, include information about the trigger details
+
+`--withActions [withActions]`
+: If specified, include information about all actions when no action names are specified, or provide a specified list of actions separated by commas to include only the relevant action details
+
 ```
 
 <Global />
@@ -44,7 +51,7 @@ If the Microsoft Flow with the name you specified doesn't exist, you will get th
 
 If the run with the name you specified doesn't exist, you will get the `The provided workflow run name is not valid.` error.
 
-If the option `includeTriggerInformation` is specified, but the trigger does not contain an outputsLink such as for example with a `Recurrence` trigger, this option will be ignored.
+If the option `withTrigger` is specified, but the trigger does not contain an outputsLink such as for example with a `Recurrence` trigger, this option will be ignored.
 
 ## Examples
 
@@ -57,7 +64,19 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
 Get information about the given run of the specified Power Automate flow including trigger information
 
 ```sh
-m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --includeTriggerInformation
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withTrigger
+```
+
+Get information about the given run of the specified Power Automate flow including details about all associated actions.
+
+```sh
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withActions
+```
+
+Get information about the given run of the specified Power Automate flow including exclusively the details of 'Action_Internal_Name1' and 'Action_Internal_Name2' actions
+
+```sh
+m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --flowName 5923cb07-ce1a-4a5c-ab81-257ce820109a --name 08586653536760200319026785874CU62 --withActions "Action_Internal_Name1,Action_Internal_Name2"
 ```
 
 ## Response
@@ -157,9 +176,9 @@ m365 flow run get --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5
   </TabItem>
 </Tabs>
 
-### `includeTriggerInformation` response
+### `withTrigger` response
 
-When using the option `includeTriggerInformation`, the response for the json-output will differ.
+When using the option `withTrigger`, the response for the json-output will differ.
 
 <Tabs>
   <TabItem value="JSON">
@@ -233,3 +252,147 @@ When using the option `includeTriggerInformation`, the response for the json-out
   </TabItem>
 </Tabs>
 
+### `withActions` response
+
+When using the option `withActions`, the response for the json-output will differ.
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "name": "08585236861638480597867166179CU104",
+    "id": "/providers/Microsoft.ProcessSimple/environments/Default-e1dd4023-a656-480a-8a0e-c1b1eec51e1d/flows/24335774-daf6-4183-acb7-f5155c2cd2fe/runs/08585236861638480597867166179CU104",
+    "type": "Microsoft.ProcessSimple/environments/flows/runs",
+    "properties": {
+      "actions":{
+        "Compose": {
+          "input": "Test",
+          "inputsLink": {
+            "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionInputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionInputs%2Fread&sv=1.0&sig=wYD6bMHjdoOawYAMTHqpmyILowLKRCkFEfsNxi1NFzw",
+            "contentVersion": "test==",
+            "contentSize": 6,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "test=="
+            }
+          },
+          "output": "Test",
+          "outputsLink": {
+            "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionOutputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionOutputs%2Fread&sv=1.0&sig=KoI4_RAEVNFUgymktOFxvfb5mCoIKR2WCYGwexjD7kY",
+            "contentVersion": "test==",
+            "contentSize": 6,
+            "contentHash": {
+              "algorithm": "md5",
+              "value": "test=="
+            }
+          },
+          "startTime": "2023-11-17T21:06:14.466889Z",
+          "endTime": "2023-11-17T21:06:14.4676104Z",
+          "correlation": {
+            "actionTrackingId": "dabed750-0ec4-4c34-98f5-cc3695e0811e",
+            "clientTrackingId": "08585013686846794051719443325CU251",
+            "clientKeywords": [
+              "resubmitFlow"
+            ]
+          },
+          "status": "Succeeded",
+          "code": "OK"
+        }
+      },
+      "startTime": "2023-03-04T09:05:21.8066368Z",
+      "endTime": "2023-03-04T09:05:22.5880202Z",
+      "status": "Succeeded",
+      "correlation": {
+        "clientTrackingId": "08585236861638480598867166179CU131"
+      },
+      "trigger": {
+        "name": "When_an_email_is_flagged_(V4)",
+        "inputsLink": {
+          "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerInputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerInputs%2Fread&sv=1.0&sig=",
+          "contentVersion": "2v/VLXFrKV6JvwSdcN7aHg==",
+          "contentSize": 343,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "2v/VLXFrKV6JvwSdcN7aHg=="
+          }
+        },
+        "outputsLink": {
+          "uri": "https://prod-130.westeurope.logic.azure.com:443/workflows/3ebadb794f6641e0b7f4fda131cdfb0b/runs/08585236861638480597867166179CU104/contents/TriggerOutputs?api-version=2016-06-01&se=2023-03-04T14%3A00%3A00.0000000Z&sp=%2Fruns%2F08585236861638480597867166179CU104%2Fcontents%2FTriggerOutputs%2Fread&sv=1.0&sig=",
+          "contentVersion": "AHZEeWNlQ0bLe48yDmpzrQ==",
+          "contentSize": 3478,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "AHZEeWNlQ0bLe48yDmpzrQ=="
+          }
+        },
+        "startTime": "2023-03-04T09:05:21.6192576Z",
+        "endTime": "2023-03-04T09:05:21.7442626Z",
+        "scheduledTime": "2023-03-04T09:05:21.573561Z",
+        "originHistoryName": "08585236861638480598867166179CU131",
+        "correlation": {
+          "clientTrackingId": "08585236861638480598867166179CU131"
+        },
+        "code": "OK",
+        "status": "Succeeded"
+      }
+    },
+    "startTime": "2023-03-04T09:05:21.8066368Z",
+    "endTime": "2023-03-04T09:05:22.5880202Z",
+    "status": "Succeeded",
+    "triggerName": "When_an_email_is_flagged_(V4)",
+    "triggerInformation": {
+      "from": "john@contoso.com",
+      "toRecipients": "doe@contoso.com",
+      "subject": "Dummy email",
+      "body": "<html><head>\r\\\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"></head><body><p>This is dummy content</p></body></html>",
+      "importance": "normal",
+      "bodyPreview": "This is dummy content",
+      "hasAttachments": false,
+      "id": "AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALUqy81AAA=",
+      "internetMessageId": "<DB7PR03MB5018879914324FC65695809FE1AD9@DB7PR03MB5018.eurprd03.prod.outlook.com>",
+      "conversationId": "AAQkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgAQAMqP9zsK8a1CnIYEgHclLTk=",
+      "receivedDateTime": "2023-03-01T15:06:57+00:00",
+      "isRead": false,
+      "attachments": [],
+      "isHtml": true
+    },
+    "actions": {
+      "Compose": {
+        "input": "Test",
+        "inputsLink": {
+          "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionInputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionInputs%2Fread&sv=1.0&sig=wYD6bMHjdoOawYAMTHqpmyILowLKRCkFEfsNxi1NFzw",
+          "contentVersion": "test==",
+          "contentSize": 6,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "test=="
+          }
+        },
+        "output": "Test",
+        "outputsLink": {
+          "uri": "https://prod-255.westeurope.logic.azure.com:443/workflows/88b5146587d144ea85efb15683c4e58f/runs/08586652586741142222645090602CU35/actions/Compose/contents/ActionOutputs?api-version=2016-06-01&se=2023-12-14T19%3A00%3A00.0000000Z&sp=%2Fruns%2F08586652586741142222645090602CU35%2Factions%2FCompose%2Fcontents%2FActionOutputs%2Fread&sv=1.0&sig=KoI4_RAEVNFUgymktOFxvfb5mCoIKR2WCYGwexjD7kY",
+          "contentVersion": "test==",
+          "contentSize": 6,
+          "contentHash": {
+            "algorithm": "md5",
+            "value": "test=="
+          }
+        },
+        "startTime": "2023-11-17T21:06:14.466889Z",
+        "endTime": "2023-11-17T21:06:14.4676104Z",
+        "correlation": {
+          "actionTrackingId": "dabed750-0ec4-4c34-98f5-cc3695e0811e",
+          "clientTrackingId": "08585013686846794051719443325CU251",
+          "clientKeywords": [
+            "resubmitFlow"
+          ]
+        },
+        "status": "Succeeded",
+        "code": "OK"
+      }
+    }
+  }
+  ```
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/spo/group/group-member-add.mdx

@@ -33,18 +33,24 @@ m365 spo group member add [options]
 `--userIds [userIds]`
 : The user Id of the user to add as a member. (Id of the site user, for example: 14) If multiple users need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
 
+`--entraGroupIds [entraGroupIds]`
+: The object Id of the Entra group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
+
 `--aadGroupIds [aadGroupIds]`
-: The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
+: (deprecated. Use `entraGroupIds` instead) The object Id of the Azure AD group to add as a member. If multiple groups need to be added, the Ids have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
+
+`--entraGroupNames [entraGroupNames]`
+: The name of the Entra group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
 
 `--aadGroupNames [aadGroupNames]`
-: The name of the Azure AD group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames`.
+: (deprecated. Use `entraGroupNames` instead) The name of the Azure AD group to add as a member. If multiple groups need to be added, they have to be comma-separated. Specify either `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames`.
 ```
 
 <Global />
 
 ## Remarks
 
-For the `userIds`, `userNames`, `emails`, `aadGroupIds` or `aadGroupNames` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
+For the `userIds`, `userNames`, `emails`, `aadGroupIds`, `entraGroupIds`, `aadGroupNames`, or `entraGroupNames` options you can specify multiple values by separating them with a comma. If one of the specified entries is not valid, the command will fail with an error message showing the list of invalid values.
 
 ## Examples
 
@@ -84,11 +90,17 @@ Add multiple users with the userIds parameter to a SharePoint group with the gro
 m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userIds "5,12"
 ```
 
-Add multiple users with the aadGroupNames parameter to a SharePoint group with the groupId parameter 
+Add multiple users with the entraGroupIds parameter to a SharePoint group with the groupId parameter.
+  
+```sh 
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupIds "f2fb2f10-cfd2-4054-8ffd-64533657a5ab,3e86049e-89e6-4c27-bccb-d7549f0bbd06"
+```
+
+Add multiple users with the entraGroupNames parameter to a SharePoint group with the groupId parameter.
   
- ```sh 
- m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --aadGroupNames "Azure group one, Azure group two" 
- ``` 
+```sh 
+m365 spo group member add --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupNames "Azure group one, Azure group two" 
+```
 
 ## Response
 

package/docs/docs/cmd/spo/group/group-member-remove.mdx

@@ -31,11 +31,17 @@ m365 spo group member remove [options]
 `--userId [userId]`
 : The user Id (Id of the site user, eg. 14) of the user to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
 
+`--entraGroupId [entraGroupId]`
+: The object Id of the Entra group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
+
 `--aadGroupId [aadGroupId]`
-: The object Id of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+: (deprecated. Use `entraGroupId` instead) The object Id of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
+
+`--entraGroupName [entraGroupName]`
+: The name of the Entra group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
 
 `--aadGroupName [aadGroupName]`
-: The name of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId` or `aadGroupName`.
+: (deprecated. Use `entraGroupName` instead) The name of the Azure AD group to remove as a member. Specify either `userName`, `email`, `userId`, `aadGroupId`, `entraGroupId`, `aadGroupName`, or `entraGroupName`.
 ```
 
 <Global />
@@ -60,16 +66,16 @@ Remove a user from a SharePoint group by email.
 m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --userId 14
 ```
 
-Remove an Azure AD group from a SharePoint group based on the Azure AD group name on a given web.
+Remove an Entra group from a SharePoint group based on the Entra group name on a given web.
 
 ```sh
-m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --aadGroupName "Azure AD Security Group"
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --entraGroupName "Azure AD Security Group"
 ```
 
-Remove an Azure AD group from a SharePoint group based on the Azure AD group ID on a given web.
+Remove an Entra group from a SharePoint group based on the Entra group ID on a given web.
 
 ```sh
-m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --aadGroupId "5786b8e8-c495-4734-b345-756733960730"
+m365 spo group member remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --entraGroupId "5786b8e8-c495-4734-b345-756733960730"
 ```
 
 ## Response