Skip to content

Commit e09e759

Browse files
authored
Merge branch 'main' into users/t-hareldamti/add-security-entity
2 parents 847c9b7 + 0a29465 commit e09e759

File tree

367 files changed

+6179
-3200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+6179
-3200
lines changed

api-reference/beta/api/application-post-federatedidentitycredentials.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ The following table lists the properties that are required when you create the [
4646
|Property|Type|Description|
4747
|:---|:---|:---|
4848
|audiences|String collection|Required. The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters.|
49+
| claimsMatchingExpression |[federatedIdentityExpression](../resources/federatedidentityexpression.md)| Nullable. Defaults to `null` if not set. Enables the use of claims matching expressions against specified claims. If **claimsMatchingExpression** is defined, **subject** must be `null`. For the list of supported expression syntax and claims, visit the [Flexible FIC reference](https://aka.ms/flexiblefic). |
4950
|issuer|String|Required. The URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters.|
5051
|name|String|Required. The unique identifier for the federated identity credential, which has a limit of 120 characters and must be URL friendly. It is immutable once created.|
51-
|subject|String|Required. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app.|
52+
|subject|String|Nullable. Defaults to `null` if not set. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app. If **subject** is defined, **claimsMatchingExpression** must be `null`.|
5253

5354

5455

api-reference/beta/api/appmanagementpolicy-post.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ Content-type: application/json
218218
"identifierUris": {
219219
"nonDefaultUriAddition": {
220220
"state": "disabled",
221-
"restrictForAppsCreatedAfterDateTime": null,
222221
"excludeAppsReceivingV2Tokens": true,
223222
"excludeSaml": true
224223
}

api-reference/beta/api/authenticationeventlistener-update.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Update the properties of an [authenticationEventListener](../resources/authentic
2222
- [onUserCreateStartListener resource type](../resources/onusercreatestartlistener.md) resource type
2323
- [onAttributeCollectionStartListener](../resources/onattributecollectionstartlistener.md) resource type
2424
- [onAttributeCollectionSubmitListener](../resources/onattributecollectionsubmitlistener.md) resource type
25+
- [onPhoneMethodLoadStartListener](../resources/onphonemethodloadstartlistener.md) resource type
2526

2627
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
2728

@@ -65,6 +66,7 @@ You must specify the **@odata.type** property and the value of the [authenticati
6566
|handler|[onUserCreateStartHandler](../resources/ontokenissuancestarthandler.md)|The handler to invoke when conditions are met. Can be updated for the **onUserCreateStartListener** listener type.|
6667
|handler|[onAttributeCollectionStartHandler](../resources/onattributecollectionstarthandler.md)|The handler to invoke when conditions are met. Can be updated for the **onAttributeCollectionStartListener** listener type.|
6768
|handler|[onAttributeCollectionSubmitHandler](../resources/onattributecollectionsubmithandler.md)|The handler to invoke when conditions are met. Can be updated for the **onAttributeCollectionSubmitListener** listener type.|
69+
|handler|[onPhoneMethodLoadStartHandler](../resources/onphonemethodloadstarthandler.md) | The handler to invoke when conditions are met. Can be updated for the **onPhoneMethodStartListener** type. |
6870
|priority|Int32|The priority of this handler. Between 0 (lower priority) and 1000 (higher priority). Required.|
6971

7072
## Response
@@ -142,6 +144,7 @@ The following example shows the response.
142144
``` http
143145
HTTP/1.1 204 No Content
144146
```
147+
145148
### Example 2: Add an application to an authentication event listener's trigger conditions
146149

147150
#### Request
@@ -215,4 +218,4 @@ Content-Type: application/json
215218
"@odata.context": "https://graph.microsoft.com/beta/$metadata#identity/authenticationEventListeners('0313cc37-d421-421d-857b-87804d61e33e')/conditions/applications/includeApplications/$entity",
216219
"appId": "63856651-13d9-4784-9abf-20758d509e19"
217220
}
218-
```
221+
```

api-reference/beta/api/chatmessage-get.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,7 @@ The following example shows a request that gets a chat message that has a Loop c
785785

786786
The following example shows a request.
787787

788+
# [HTTP](#tab/http)
788789
<!-- {
789790
"blockType": "request",
790791
"name": "get_chatmessage_7",
@@ -794,6 +795,40 @@ The following example shows a request.
794795
GET https://graph.microsoft.com/beta/chats/19:e2ed97baac8e4bffbb91299a38996790@thread.v2/messages/1732043970539
795796
```
796797

798+
# [C#](#tab/csharp)
799+
[!INCLUDE [sample-code](../includes/snippets/csharp/get-chatmessage-7-csharp-snippets.md)]
800+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
801+
802+
# [CLI](#tab/cli)
803+
[!INCLUDE [sample-code](../includes/snippets/cli/get-chatmessage-7-cli-snippets.md)]
804+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
805+
806+
# [Go](#tab/go)
807+
[!INCLUDE [sample-code](../includes/snippets/go/get-chatmessage-7-go-snippets.md)]
808+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
809+
810+
# [Java](#tab/java)
811+
[!INCLUDE [sample-code](../includes/snippets/java/get-chatmessage-7-java-snippets.md)]
812+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
813+
814+
# [JavaScript](#tab/javascript)
815+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-chatmessage-7-javascript-snippets.md)]
816+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
817+
818+
# [PHP](#tab/php)
819+
[!INCLUDE [sample-code](../includes/snippets/php/get-chatmessage-7-php-snippets.md)]
820+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
821+
822+
# [PowerShell](#tab/powershell)
823+
[!INCLUDE [sample-code](../includes/snippets/powershell/get-chatmessage-7-powershell-snippets.md)]
824+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
825+
826+
# [Python](#tab/python)
827+
[!INCLUDE [sample-code](../includes/snippets/python/get-chatmessage-7-python-snippets.md)]
828+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
829+
830+
---
831+
797832

798833

799834
#### Response

api-reference/beta/api/cloudpc-get.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/4
202202
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
203203

204204
# [JavaScript](#tab/javascript)
205-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
205+
[!INCLUDE [sample-code](../includes/snippets/javascript/get-cloudpc-selected-properties-javascript-snippets.md)]
206206
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
207207

208208
# [PHP](#tab/php)

api-reference/beta/api/cloudpc-getprovisionedcloudpcs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ GET https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/cloudPCs/g
224224
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
225225

226226
# [JavaScript](#tab/javascript)
227-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
227+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcgetprovisionedcloudpcs-2-javascript-snippets.md)]
228228
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
229229

230230
# [PHP](#tab/php)

api-reference/beta/api/driveitem-copy.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ Content-Type: application/json
428428

429429
---
430430

431-
432431
#### Response
433432

434433
The following example shows the response.

api-reference/beta/api/federatedidentitycredential-update.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ The following table specifies the properties that can be updated.
5555
|Property|Type|Description|
5656
|:---|:---|:---|
5757
|audiences|String collection|The audience that can appear in the issued token. For Microsoft Entra ID, set its value to `api://AzureADTokenExchange`. This field can only accept a single value and has a limit of 600 characters. |
58+
| claimsMatchingExpression |[federatedIdentityExpression](../resources/federatedidentityexpression.md)| Nullable. Defaults to `null` if not set. Enables the use of claims matching expressions against specified claims. If **claimsMatchingExpression** is defined, **subject** must be `null`. For the list of supported expression syntax and claims, visit the [Flexible FIC reference](https://aka.ms/flexiblefic). |
5859
|description|String|A user-provided description of what the federatedIdentityCredential is used for. It has a limit of 600 characters. |
5960
|issuer|String|The URL of the incoming trusted issuer (Secure Token Service). Matches the issuer claim of an access token. For example, with the Customer Managed Keys scenario, Microsoft Entra ID is the issuer and a valid value would be `https://login.microsoftonline.com/{tenantid}/v2.0`. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters.|
60-
|subject|String|<li>For Microsoft Entra issuer, the `objectId` of the servicePrincipal (can represent a managed identity) that can impersonate the app. The object associated with this GUID needs to exist in the tenant.</li><li>For all other issuers, a string with no additional validation</ul><br><br>The combination of the values of **issuer** and **subject** must be unique on the app.It has a limit of 600 characters.|
61+
|subject|String|Nullable. Defaults to `null` if not set. <li>For Microsoft Entra issuer, the `objectId` of the servicePrincipal (can represent a managed identity) that can impersonate the app. The object associated with this GUID needs to exist in the tenant.</li><li>For all other issuers, a string with no additional validation</ul><br><br>The combination of the values of **issuer** and **subject** must be unique on the app. If **subject** is defined, **claimsMatchingExpression** must be `null`. It has a limit of 600 characters.|
6162

6263

6364

api-reference/beta/api/federatedidentitycredential-upsert.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ The following table lists the properties that are required when you create the [
4848
|Property|Type|Description|
4949
|:---|:---|:---|
5050
|audiences|String collection|The audience that can appear in the external token. This field is mandatory and should be set to `api://AzureADTokenExchange` for Microsoft Entra ID. It says what Microsoft identity platform should accept in the `aud` claim in the incoming token. This value represents Microsoft Entra ID in your external identity provider and has no fixed value across identity providers - you may need to create a new application registration in your identity provider to serve as the audience of this token. This field can only accept a single value and has a limit of 600 characters. Required.|
51+
| claimsMatchingExpression |[federatedIdentityExpression](../resources/federatedidentityexpression.md)| Nullable. Defaults to `null` if not set.Enables the use of claims matching expressions against specified claims. If **claimsMatchingExpression** is defined, **subject** must be `null`. For the list of supported expression syntax and claims, visit the [Flexible FIC reference](https://aka.ms/flexiblefic). |
5152
|issuer|String|TThe URL of the external identity provider and must match the issuer claim of the external token being exchanged. The combination of the values of **issuer** and **subject** must be unique on the app. It has a limit of 600 characters. Required.|
52-
|subject|String|Required. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app.|
53+
|subject|String|Nullable. Defaults to `null` if not set. The identifier of the external software workload within the external identity provider. Like the audience value, it has no fixed format, as each identity provider uses their own - sometimes a GUID, sometimes a colon delimited identifier, sometimes arbitrary strings. The value here must match the sub claim within the token presented to Microsoft Entra ID. It has a limit of 600 characters. The combination of **issuer** and **subject** must be unique on the app. If **subject** is defined, **claimsMatchingExpression** must be `null`.|
5354

5455
## Response
5556

api-reference/beta/api/group-post-members.md

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ The following table shows the least privileged permission that's required by eac
5555

5656
```http
5757
POST /groups/{group-id}/members/$ref
58-
POST /groups/{group-id}/members/
58+
PATCH /groups/{group-id}/members
5959
```
6060

6161
## Request headers
@@ -67,11 +67,16 @@ POST /groups/{group-id}/members/
6767

6868
## Request body
6969

70-
When using the `/groups/{group-id}/members/$ref` syntax, supply a JSON object that contains an **@odata.id** property with a reference by ID to a supported group member object type.
70+
When using the `POST /groups/{group-id}/members/$ref` syntax, supply a JSON object that contains an **@odata.id** property with a reference by ID to a supported group member object type.
7171

72-
When using the `/groups/{group-id}/members` syntax, supply a JSON object that contains a **members@odata.bind** property with one or more references by IDs to a supported group member object type.
73-
74-
If using the **directoryObjects** reference, that is, `https://graph.microsoft.com/v1.0/directoryObjects/{id}`, the object type must still be a supported group member object type.
72+
When using the `PATCH /groups/{group-id}/members` syntax, supply a JSON object that contains a **members@odata.bind** property with one or more references by IDs to a supported group member object type. That is:
73+
- For Microsoft 365 groups, only `https://graph.microsoft.com/v1.0/directoryObjects/{id}` and `https://graph.microsoft.com/v1.0/groups/{id}` is allowed where `{id}` must be a user because only users can members of Microsoft 365 groups.
74+
- For security groups, the following ID references are allowed:
75+
- `https://graph.microsoft.com/v1.0/directoryObjects/{id}` where `{id}` must belong to a user, security group, device, service principal, or organizational contact.
76+
- `https://graph.microsoft.com/v1.0/groups/{id}` where `{id}` must belong to another security group. Microsoft 365 groups can't be members of security groups.
77+
- `https://graph.microsoft.com/v1.0/devices/{id}` where `{id}` belongs to a device.
78+
- `https://graph.microsoft.com/v1.0/servicePrincipal/{id}` where `{id}` belongs to a service principal.
79+
- `https://graph.microsoft.com/v1.0/orgContact/{id}` where `{id}` belongs to an organizational contact.
7580

7681
## Response
7782

@@ -82,9 +87,11 @@ If successful, this method returns a `204 No Content` response code. It returns
8287

8388
## Example
8489

85-
### Request
90+
### Example 1: Add a member to a group
8691

87-
The following example shows a request.
92+
#### Request
93+
94+
The following example shows a request that uses the **directoryObjects** reference to add a member to a group.
8895

8996
# [HTTP](#tab/http)
9097

@@ -136,9 +143,44 @@ Content-type: application/json
136143

137144
---
138145

139-
In the request body, supply a JSON representation of the `id` of the [directoryObject](../resources/directoryobject.md), [user](../resources/user.md), or [group](../resources/group.md) object you want to add.
146+
#### Response
147+
148+
The following example shows the response.
149+
150+
<!-- {
151+
"blockType": "response"
152+
} -->
153+
154+
```http
155+
HTTP/1.1 204 No Content
156+
```
157+
158+
### Example 2: Add multiple members to a group in a single request
159+
160+
This example shows how to add multiple members to a group with OData bind support in a PATCH operation. Up to 20 members can be added in a single request. If an error condition exists in the request body, no members are added and the appropriate response code is returned.
161+
162+
#### Request
163+
164+
The following example shows a request.
165+
<!-- {
166+
"blockType": "request",
167+
"name": "add_multiple_members_to_group"
168+
}-->
169+
170+
```http
171+
PATCH https://graph.microsoft.com/beta/groups/{group-id}
172+
Content-type: application/json
173+
174+
{
175+
"members@odata.bind": [
176+
"https://graph.microsoft.com/beta/directoryObjects/{id}",
177+
"https://graph.microsoft.com/beta/directoryObjects/{id}",
178+
"https://graph.microsoft.com/beta/directoryObjects/{id}"
179+
]
180+
}
181+
```
140182

141-
### Response
183+
#### Response
142184

143185
The following example shows the response.
144186

0 commit comments

Comments
 (0)