Skip to content

Commit 6fc8b40

Browse files
authored
Merge pull request #26575 from microsoftgraph/main
Merge to publish.
2 parents 9da69db + 81924a4 commit 6fc8b40

31 files changed

+1204
-469
lines changed

api-reference/beta/api/healthmonitoring-alert-get.md

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ When no `$expand` query parameter is added, this API doesn't return `resourceSam
4848
|Name|Description|
4949
|:---|:---|
5050
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
51+
|Prefer: include-unknown-enum-members | Enables evolvable enum values beyond the sentinel value. For more information, see [Best practices for working with Microsoft Graph](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations). Optional. |
5152

5253
## Request body
5354

api-reference/beta/api/healthmonitoring-alert-update.md

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ PATCH /reports/healthMonitoring/alerts/{alertId}
4343
|:---|:---|
4444
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
4545
|Content-Type|application/json. Required.|
46+
|Prefer: include-unknown-enum-members | Enables evolvable enum values beyond the sentinel value. For more information, see [Best practices for working with Microsoft Graph](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations). Optional. |
4647

4748
## Request body
4849

api-reference/beta/api/healthmonitoring-healthmonitoringroot-list-alerts.md

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ When no `$expand` query parameter is added, this API doesn't return `resourceSam
5050
|Name|Description|
5151
|:---|:---|
5252
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
53+
|Prefer: include-unknown-enum-members | Enables evolvable enum values beyond the sentinel value. For more information, see [Best practices for working with Microsoft Graph](/graph/best-practices-concept#handling-future-members-in-evolvable-enumerations). Optional. |
5354

5455
## Request body
5556

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
---
2+
title: "List userConfigurations"
3+
description: "Get user configurations for all Teams users who belong to a tenant."
4+
author: "praspatil05"
5+
ms.date: 03/19/2025
6+
ms.localizationpriority: medium
7+
ms.subservice: "teams"
8+
doc_type: apiPageType
9+
---
10+
11+
# List userConfigurations
12+
13+
Namespace: microsoft.graph.teamsAdministration
14+
15+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
16+
17+
Get [user configurations](../resources/teamsadministration-teamsuserconfiguration.md) for all Teams users who belong to a tenant.
18+
19+
## Permissions
20+
21+
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
22+
23+
<!-- {
24+
"blockType": "permissions",
25+
"name": "teamsadministration-teamsadminroot-list-userconfigurations-permissions"
26+
}
27+
-->
28+
[!INCLUDE [permissions-table](../includes/permissions/teamsadministration-teamsadminroot-list-userconfigurations-permissions.md)]
29+
30+
## HTTP request
31+
32+
<!-- {
33+
"blockType": "ignored"
34+
}
35+
-->
36+
``` http
37+
GET /admin/teams/userConfigurations
38+
```
39+
40+
## Optional query parameters
41+
42+
This method supports the `$select`, `$filter`, `$top`, `$expand`, and `$orderBy` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
43+
44+
## Request headers
45+
46+
|Name|Description|
47+
|:---|:---|
48+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
49+
50+
## Request body
51+
52+
Don't supply a request body for this method.
53+
54+
## Response
55+
56+
If successful, this method returns a `200 OK` response code and a collection of [microsoft.graph.teamsAdministration.teamsUserConfiguration](../resources/teamsadministration-teamsuserconfiguration.md) objects in the response body.
57+
58+
## Examples
59+
60+
### Request
61+
62+
The following example shows a request.
63+
<!-- {
64+
"blockType": "request",
65+
"name": "list_teamsuserconfiguration"
66+
}
67+
-->
68+
``` http
69+
GET https://graph.microsoft.com/beta/admin/teams/userConfigurations
70+
```
71+
72+
### Response
73+
74+
The following example shows the response.
75+
>**Note:** The response object shown here might be shortened for readability.
76+
<!-- {
77+
"blockType": "response",
78+
"truncated": true,
79+
"@odata.type": "Collection(microsoft.graph.teamsAdministration.teamsUserConfiguration)"
80+
}
81+
-->
82+
``` http
83+
HTTP/1.1 200 OK
84+
Content-Type: application/json
85+
86+
{
87+
"value": [
88+
{
89+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#admin/teams/userConfigurations",
90+
"id": "5c802b19-3600-83f1-1767-7b9edc7f38ab",
91+
"userPrincipalName": "AdeleV@contoso.com",
92+
"tenantId": "87d349ed-44d7-43e1-9a83-5f2406dee5bd",
93+
"effectivePolicyAssignments": [
94+
{
95+
"policyType": "TeamsCallingPolicy",
96+
"policyAssignment": {
97+
"displayName": "AllOn",
98+
"assignmentType": "group",
99+
"policyId": "f7593e81-772a-4455-88a3-fc9e5ebc1e4a",
100+
"groupId": "75ae6229-35fe-4b01-ae7f-7c50439d239c"
101+
}
102+
},
103+
{
104+
"policyType": "TeamsMeetingPolicy",
105+
"policyAssignment": {
106+
"displayName": "CustomPolicy",
107+
"assignmentType": "direct",
108+
"policyId": "J93PmFHwFcLZhWfYcBlv9pn-hG-kUWkcxmkDvpwgacw"
109+
}
110+
}
111+
],
112+
"telephoneNumbers": [
113+
{
114+
"telephoneNumber": "+13235533696",
115+
"assignmentCategory": "primary"
116+
}
117+
],
118+
"isEnterpriseVoiceEnabled": false,
119+
"featureTypes": [
120+
"Teams",
121+
"CallingPlan"
122+
],
123+
"accountType": "user",
124+
"createdDateTime": "2025-01-07T09:08:50.9115993Z",
125+
"modifiedDateTime": "2025-01-07T09:08:50.9115993Z"
126+
}
127+
]
128+
}
129+
```
130+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
---
2+
title: "Get teamsUserConfiguration"
3+
description: "Read the Teams user configurations for a specific user using their ID (the user's identifier)."
4+
author: "praspatil05"
5+
ms.date: 03/19/2025
6+
ms.localizationpriority: medium
7+
ms.subservice: "teams"
8+
doc_type: apiPageType
9+
---
10+
11+
# Get teamsUserConfiguration
12+
13+
Namespace: microsoft.graph.teamsAdministration
14+
15+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
16+
17+
Read the Teams user configurations for a specific user using their ID (the user's identifier).
18+
19+
## Permissions
20+
21+
Choose the permission or permissions marked as least privileged for this API. Use a higher privileged permission or permissions [only if your app requires it](/graph/permissions-overview#best-practices-for-using-microsoft-graph-permissions). For details about delegated and application permissions, see [Permission types](/graph/permissions-overview#permission-types). To learn more about these permissions, see the [permissions reference](/graph/permissions-reference).
22+
23+
<!-- {
24+
"blockType": "permissions",
25+
"name": "teamsadministration-teamsuserconfiguration-get-permissions"
26+
}
27+
-->
28+
[!INCLUDE [permissions-table](../includes/permissions/teamsadministration-teamsuserconfiguration-get-permissions.md)]
29+
30+
## HTTP request
31+
32+
<!-- {
33+
"blockType": "ignored"
34+
}
35+
-->
36+
``` http
37+
GET /admin/teams/userConfigurations/{teamsUserConfigurationId}
38+
```
39+
40+
## Optional query parameters
41+
42+
This method supports the `$select` and `$expand` OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
43+
44+
## Request headers
45+
46+
|Name|Description|
47+
|:---|:---|
48+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
49+
50+
## Request body
51+
52+
Don't supply a request body for this method.
53+
54+
## Response
55+
56+
If successful, this method returns a `200 OK` response code and a [microsoft.graph.teamsAdministration.teamsUserConfiguration](../resources/teamsadministration-teamsuserconfiguration.md) object in the response body.
57+
58+
## Examples
59+
60+
### Request
61+
62+
The following example shows a request.
63+
<!-- {
64+
"blockType": "request",
65+
"name": "get_teamsuserconfiguration",
66+
"sampleKeys": ["5c802b19-3600-83f1-1767-7b9edc7f38ab"]
67+
}
68+
-->
69+
``` http
70+
GET https://graph.microsoft.com/beta/admin/teams/userConfigurations/5c802b19-3600-83f1-1767-7b9edc7f38ab
71+
```
72+
73+
### Response
74+
75+
The following example shows the response.
76+
>**Note:** The response object shown here might be shortened for readability.
77+
<!-- {
78+
"blockType": "response",
79+
"truncated": true,
80+
"@odata.type": "microsoft.graph.teamsAdministration.teamsUserConfiguration"
81+
}
82+
-->
83+
``` http
84+
HTTP/1.1 200 OK
85+
Content-Type: application/json
86+
87+
{
88+
"value": {
89+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#admin/teams/userConfigurations/$entity",
90+
"id": "5c802b19-3600-83f1-1767-7b9edc7f38ab",
91+
"userPrincipalName": "AdeleV@contoso.com",
92+
"tenantId": "87d349ed-44d7-43e1-9a83-5f2406dee5bd",
93+
"effectivePolicyAssignments": [
94+
{
95+
"policyType": "TeamsCallingPolicy",
96+
"policyAssignment": {
97+
"displayName": "AllOn",
98+
"assignmentType": "group",
99+
"policyId": "f7593e81-772a-4455-88a3-fc9e5ebc1e4a",
100+
"groupId": "75ae6229-35fe-4b01-ae7f-7c50439d239c"
101+
}
102+
},
103+
{
104+
"policyType": "TeamsMeetingPolicy",
105+
"policyAssignment": {
106+
"displayName": "CustomPolicy",
107+
"assignmentType": "direct",
108+
"policyId": "J93PmFHwFcLZhWfYcBlv9pn-hG-kUWkcxmkDvpwgacw"
109+
}
110+
}
111+
],
112+
"telephoneNumbers": [
113+
{
114+
"telephoneNumber": "+13235533696",
115+
"assignmentCategory": "primary"
116+
}
117+
],
118+
"isEnterpriseVoiceEnabled": false,
119+
"featureTypes": [
120+
"Teams",
121+
"CallingPlan"
122+
],
123+
"accountType": "user",
124+
"createdDateTime": "2025-01-07T09:08:50.9115993Z",
125+
"modifiedDateTime": "2025-01-07T09:08:50.9115993Z"
126+
}
127+
}
128+
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
description: Automatically generated file. DO NOT MODIFY
3+
ms.topic: include
4+
ms.localizationpriority: medium
5+
---
6+
7+
|Permission type|Least privileged permissions|Higher privileged permissions|
8+
|:---|:---|:---|
9+
|Delegated (work or school account)|TeamsUserConfiguration.Read.All|Not available.|
10+
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
11+
|Application|TeamsUserConfiguration.Read.All|Not available.|
12+
13+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
description: Automatically generated file. DO NOT MODIFY
3+
ms.topic: include
4+
ms.localizationpriority: medium
5+
---
6+
7+
|Permission type|Least privileged permissions|Higher privileged permissions|
8+
|:---|:---|:---|
9+
|Delegated (work or school account)|TeamsUserConfiguration.Read.All|Not available.|
10+
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
11+
|Application|TeamsUserConfiguration.Read.All|Not available.|
12+
13+

api-reference/beta/resources/admin.md

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Represents an entity that acts as a container for administrator functionality.
3232
| reportSettings |[microsoft.graph.adminReportSettings](../resources/adminreportsettings.md)|A container for administrative resources to manage reports.|
3333
| serviceAnnouncement | [serviceAnnouncement](serviceannouncement.md) | A container for service communications resources. Read-only. |
3434
| sharepointSettings | [sharepointSettings](../resources/sharepointSettings.md) | A container for administrative resources to manage tenant-level settings for SharePoint and OneDrive. |
35+
| teams|[microsoft.graph.teamsAdministration.teamsAdminRoot](../resources/teamsadministration-teamsadminroot.md)|Represents a collection of user configurations.|
3536
| windows |[microsoft.graph.adminWindows](../resources/adminwindows.md)|A container for all Windows administrator functionalities. Read-only.|
3637

3738
## JSON representation

api-reference/beta/resources/conditionalaccessapplications.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ Represents the applications and user actions included in and excluded from the c
2121

2222
| Property | Type | Description |
2323
|:-------- |:---- |:----------- |
24-
| includeApplications | String collection | Can be one of the following: <li> The list of client IDs (**appId**) the policy applies to, unless explicitly excluded (in **excludeApplications**) <li> `All` <li> `Office365` - For the list of apps included in `Office365`, see [Apps included in Conditional Access Office 365 app suite](/entra/identity/conditional-access/reference-office-365-application-contents) <li> `MicrosoftAdminPortals` - For more information, see [Conditional Access Target resources: Microsoft Admin Portals](/entra/identity/conditional-access/concept-conditional-access-cloud-apps#microsoft-admin-portals) |
25-
| excludeApplications | String collection | Can be one of the following: <li> The list of client IDs (**appId**) explicitly excluded from the policy.<li> `Office365` - For the list of apps included in `Office365`, see [Apps included in Conditional Access Office 365 app suite](/entra/identity/conditional-access/reference-office-365-application-contents) <li> `MicrosoftAdminPortals` - For more information, see [Conditional Access Target resources: Microsoft Admin Portals](/entra/identity/conditional-access/concept-conditional-access-cloud-apps#microsoft-admin-portals)|
2624
| applicationFilter | [conditionalAccessFilter](conditionalaccessfilter.md) | Filter that defines the dynamic-application-syntax rule to include/exclude cloud applications. A filter can use custom security attributes to include/exclude applications. |
25+
| excludeApplications | String collection | Can be one of the following: <li> The list of client IDs (**appId**) explicitly excluded from the policy.<li> `Office365` - For the list of apps included in `Office365`, see [Apps included in Conditional Access Office 365 app suite](/entra/identity/conditional-access/reference-office-365-application-contents) <li> `MicrosoftAdminPortals` - For more information, see [Conditional Access Target resources: Microsoft Admin Portals](/entra/identity/conditional-access/concept-conditional-access-cloud-apps#microsoft-admin-portals)|
26+
| globalSecureAccess (deprecated)| [conditionalAccessGlobalSecureAccess](conditionalaccessglobalsecureaccess.md) | Represents traffic profile for Global Secure Access. This property is deprecated and will stop returning data on June 1, 2025. Use new Global Secure Access applications instead.|
27+
| includeApplications | String collection | Can be one of the following: <li> The list of client IDs (**appId**) the policy applies to, unless explicitly excluded (in **excludeApplications**) <li> `All` <li> `Office365` - For the list of apps included in `Office365`, see [Apps included in Conditional Access Office 365 app suite](/entra/identity/conditional-access/reference-office-365-application-contents) <li> `MicrosoftAdminPortals` - For more information, see [Conditional Access Target resources: Microsoft Admin Portals](/entra/identity/conditional-access/concept-conditional-access-cloud-apps#microsoft-admin-portals) |
2728
| includeUserActions | String collection | User actions to include. Supported values are `urn:user:registersecurityinfo` and `urn:user:registerdevice` |
2829
| includeAuthenticationContextClassReferences | String collection | Authentication context class references include. Supported values are `c1` through `c25`. |
2930
| networkAccess (deprecated)| [conditionalAccessNetworkAccess](conditionalaccessnetworkaccess.md) | Represents traffic profile for Global Secure Access. This property is deprecated and will stop returning data on June 1, 2025. Use new Global Secure Access applications instead.|
30-
| globalSecureAccess (deprecated)| [conditionalAccessGlobalSecureAccess](conditionalaccessglobalsecureaccess.md) | Represents traffic profile for Global Secure Access. This property is deprecated and will stop returning data on June 1, 2025. Use new Global Secure Access applications instead.|
3131

3232
## Relationships
3333

@@ -68,4 +68,3 @@ The following JSON representation shows the resource type.
6868
"section": "documentation",
6969
"tocPath": ""
7070
}-->
71-

api-reference/beta/resources/crosstenantaccesspolicyinboundtrust.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Defines the Conditional Access claims you want to accept from other Microsoft En
2323
| isCompliantDeviceAccepted | Boolean | Specifies whether compliant devices from external Microsoft Entra organizations are trusted. |
2424
| isHybridAzureADJoinedDeviceAccepted | Boolean | Specifies whether Microsoft Entra hybrid joined devices from external Microsoft Entra organizations are trusted. |
2525
| isMfaAccepted | Boolean | Specifies whether MFA from external Microsoft Entra organizations is trusted.|
26+
| isCompliantNetworkAccepted | Boolean | Specifies whether compliant network from external Microsoft Entra organizations is trusted.|
2627

2728
## Relationships
2829

@@ -42,6 +43,7 @@ The following JSON representation shows the resource type.
4243
"@odata.type": "#microsoft.graph.crossTenantAccessPolicyInboundTrust",
4344
"isMfaAccepted": "Boolean",
4445
"isCompliantDeviceAccepted": "Boolean",
45-
"isHybridAzureADJoinedDeviceAccepted": "Boolean"
46+
"isHybridAzureADJoinedDeviceAccepted": "Boolean",
47+
"isCompliantNetworkAccepted": "Boolean"
4648
}
4749
```

api-reference/beta/resources/enums-healthmonitoring.md

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Namespace: microsoft.graph.healthMonitoring
3333
|managedDeviceSignInFailure|
3434
|compliantDeviceSignInFailure|
3535
|unknownFutureValue|
36+
|conditionalAccessBlockedSignIn|
3637

3738
### category values
3839

@@ -65,6 +66,7 @@ Namespace: microsoft.graph.healthMonitoring
6566
|mfa|
6667
|devices|
6768
|unknownFutureValue|
69+
|conditionalAccess|
6870

6971
<!--
7072
{

0 commit comments

Comments
 (0)