Skip to content

Commit bf5f492

Browse files
committed
merge
2 parents a9c5fee + 32f3a05 commit bf5f492

File tree

617 files changed

+4575
-2034
lines changed

Some content is hidden

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

617 files changed

+4575
-2034
lines changed

api-reference/beta/api/administrativeunit-delta.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Get newly created, updated, or deleted **administrativeUnits** without having to perform a full read of the entire resource collection. For details, see [Using delta query](/graph/delta-query-overview).
16+
Get newly created, updated, or deleted **administrativeUnits** without having to perform a full read of the entire resource collection. For more information, see [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) for details.
1717

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

api-reference/beta/api/application-delta.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Get newly created, updated, or deleted applications without having to perform a full read of the entire resource collection. See [Using Delta Query](/graph/delta-query-overview) for details.
16+
Get newly created, updated, or deleted applications without having to perform a full read of the entire resource collection. For more information, see [Use delta query to track changes in Microsoft Graph data](/graph/delta-query-overview) for details.
1717

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,35 +169,35 @@ GET https://graph.microsoft.com/beta/users/071cc716-8147-4397-a5ba-b2105951cc0b/
169169
```
170170

171171
# [C#](#tab/csharp)
172-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
172+
[!INCLUDE [sample-code](../includes/snippets/csharp/get-authentication-strongauthenticationrequirements-csharp-snippets.md)]
173173
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
174174

175175
# [CLI](#tab/cli)
176-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
176+
[!INCLUDE [sample-code](../includes/snippets/cli/get-authentication-strongauthenticationrequirements-cli-snippets.md)]
177177
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
178178

179179
# [Go](#tab/go)
180-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
180+
[!INCLUDE [sample-code](../includes/snippets/go/get-authentication-strongauthenticationrequirements-go-snippets.md)]
181181
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
182182

183183
# [Java](#tab/java)
184-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
184+
[!INCLUDE [sample-code](../includes/snippets/java/get-authentication-strongauthenticationrequirements-java-snippets.md)]
185185
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
186186

187187
# [JavaScript](#tab/javascript)
188188
[!INCLUDE [sample-code](../includes/snippets/javascript/get-authentication-strongauthenticationrequirements-javascript-snippets.md)]
189189
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
190190

191191
# [PHP](#tab/php)
192-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
192+
[!INCLUDE [sample-code](../includes/snippets/php/get-authentication-strongauthenticationrequirements-php-snippets.md)]
193193
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
194194

195195
# [PowerShell](#tab/powershell)
196196
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
197197
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
198198

199199
# [Python](#tab/python)
200-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
200+
[!INCLUDE [sample-code](../includes/snippets/python/get-authentication-strongauthenticationrequirements-python-snippets.md)]
201201
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
202202

203203
---

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,35 +180,35 @@ Content-Type: application/json
180180
```
181181

182182
# [C#](#tab/csharp)
183-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
183+
[!INCLUDE [sample-code](../includes/snippets/csharp/update-authentication-strongauthenticationrequirements-csharp-snippets.md)]
184184
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
185185

186186
# [CLI](#tab/cli)
187-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
187+
[!INCLUDE [sample-code](../includes/snippets/cli/update-authentication-strongauthenticationrequirements-cli-snippets.md)]
188188
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
189189

190190
# [Go](#tab/go)
191-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
191+
[!INCLUDE [sample-code](../includes/snippets/go/update-authentication-strongauthenticationrequirements-go-snippets.md)]
192192
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
193193

194194
# [Java](#tab/java)
195-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
195+
[!INCLUDE [sample-code](../includes/snippets/java/update-authentication-strongauthenticationrequirements-java-snippets.md)]
196196
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
197197

198198
# [JavaScript](#tab/javascript)
199199
[!INCLUDE [sample-code](../includes/snippets/javascript/update-authentication-strongauthenticationrequirements-javascript-snippets.md)]
200200
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
201201

202202
# [PHP](#tab/php)
203-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
203+
[!INCLUDE [sample-code](../includes/snippets/php/update-authentication-strongauthenticationrequirements-php-snippets.md)]
204204
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
205205

206206
# [PowerShell](#tab/powershell)
207207
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
208208
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
209209

210210
# [Python](#tab/python)
211-
[!INCLUDE [snippet-not-available](../includes/snippets/snippet-not-available.md)]
211+
[!INCLUDE [sample-code](../includes/snippets/python/update-authentication-strongauthenticationrequirements-python-snippets.md)]
212212
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
213213

214214
---

api-reference/beta/api/chartcollection-itemat.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,10 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartcollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81-
# [Java](#tab/java)
82-
[!INCLUDE [sample-code](../includes/snippets/java/chartcollection-itemat-java-snippets.md)]
83-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84-
8581
# [JavaScript](#tab/javascript)
8682
[!INCLUDE [sample-code](../includes/snippets/javascript/chartcollection-itemat-javascript-snippets.md)]
8783
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8884

89-
# [PHP](#tab/php)
90-
[!INCLUDE [sample-code](../includes/snippets/php/chartcollection-itemat-php-snippets.md)]
91-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92-
93-
# [Python](#tab/python)
94-
[!INCLUDE [sample-code](../includes/snippets/python/chartcollection-itemat-python-snippets.md)]
95-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96-
9785
---
9886

9987
##### Response

api-reference/beta/api/chartpointscollection-itemat.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,10 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartpointscollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81-
# [Java](#tab/java)
82-
[!INCLUDE [sample-code](../includes/snippets/java/chartpointscollection-itemat-java-snippets.md)]
83-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84-
8581
# [JavaScript](#tab/javascript)
8682
[!INCLUDE [sample-code](../includes/snippets/javascript/chartpointscollection-itemat-javascript-snippets.md)]
8783
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8884

89-
# [PHP](#tab/php)
90-
[!INCLUDE [sample-code](../includes/snippets/php/chartpointscollection-itemat-php-snippets.md)]
91-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92-
93-
# [Python](#tab/python)
94-
[!INCLUDE [sample-code](../includes/snippets/python/chartpointscollection-itemat-python-snippets.md)]
95-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96-
9785
---
9886

9987
##### Response

api-reference/beta/api/chartseriescollection-itemat.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,10 @@ GET https://graph.microsoft.com/beta/me/drive/items/{id}/workbook/worksheets/{id
7878
[!INCLUDE [sample-code](../includes/snippets/go/chartseriescollection-itemat-go-snippets.md)]
7979
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8080

81-
# [Java](#tab/java)
82-
[!INCLUDE [sample-code](../includes/snippets/java/chartseriescollection-itemat-java-snippets.md)]
83-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
84-
8581
# [JavaScript](#tab/javascript)
8682
[!INCLUDE [sample-code](../includes/snippets/javascript/chartseriescollection-itemat-javascript-snippets.md)]
8783
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
8884

89-
# [PHP](#tab/php)
90-
[!INCLUDE [sample-code](../includes/snippets/php/chartseriescollection-itemat-php-snippets.md)]
91-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
92-
93-
# [Python](#tab/python)
94-
[!INCLUDE [sample-code](../includes/snippets/python/chartseriescollection-itemat-python-snippets.md)]
95-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
96-
9785
---
9886

9987
##### Response

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

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,89 @@ Content-type: application/json
658658
}
659659
```
660660

661+
### Example 6: Get a chat message with a forwarded message
662+
663+
The following example shows a request that gets a chat message with a forwarded message as an attachment.
664+
665+
#### Request
666+
667+
The following example shows a request.
668+
669+
<!-- {
670+
"blockType": "request",
671+
"name": "get_chatmessage_6",
672+
"sampleKeys": ["19:e2ed97baac8e4bffbb91299a38996790@thread.v2", "1727903166936"]
673+
}-->
674+
```msgraph-interactive
675+
GET https://graph.microsoft.com/beta/chats/19:e2ed97baac8e4bffbb91299a38996790@thread.v2/messages/1727903166936
676+
```
677+
678+
#### Response
679+
680+
The following example shows the response. The message body contains a forwarded message as an attachment. The **contentType** for the forwarded message is identified as `forwardedMessageReference`. The original message that was forwarded is also available in the attachment **content**.
681+
682+
<!-- {
683+
"blockType": "response",
684+
"truncated": true,
685+
"@odata.type": "microsoft.graph.chatMessage"
686+
} -->
687+
688+
```http
689+
HTTP/1.1 200 OK
690+
Content-type: application/json
691+
692+
{
693+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#chats('19%3Ae2ed97baac8e4bffbb91299a38996790%40thread.v2')/messages/$entity",
694+
"@microsoft.graph.tips": "Use $select to choose only the properties your app needs, as this can lead to performance improvements. For example: GET chats('<key>')/messages('<key>')?$select=attachments,body",
695+
"id": "1727903166936",
696+
"replyToId": null,
697+
"etag": "1727903166936",
698+
"messageType": "message",
699+
"createdDateTime": "2024-10-02T21:06:06.936Z",
700+
"lastModifiedDateTime": "2024-10-02T21:06:06.936Z",
701+
"lastEditedDateTime": null,
702+
"deletedDateTime": null,
703+
"subject": null,
704+
"summary": null,
705+
"chatId": "19:e2ed97baac8e4bffbb91299a38996790@thread.v2",
706+
"importance": "normal",
707+
"locale": "en-us",
708+
"webUrl": null,
709+
"channelIdentity": null,
710+
"onBehalfOf": null,
711+
"policyViolation": null,
712+
"eventDetail": null,
713+
"from": {
714+
"application": null,
715+
"device": null,
716+
"user": {
717+
"@odata.type": "#microsoft.graph.teamworkUserIdentity",
718+
"id": "28c10244-4bad-4fda-993c-f332faef94f0",
719+
"displayName": null,
720+
"userIdentityType": "aadUser",
721+
"tenantId": "2432b57b-0abd-43db-aa7b-16eadd115d34"
722+
}
723+
},
724+
"body": {
725+
"contentType": "html",
726+
"content": "<attachment id=\"1727881360458\"></attachment>"
727+
},
728+
"attachments": [
729+
{
730+
"id": "1727881360458",
731+
"contentType": "forwardedMessageReference",
732+
"contentUrl": null,
733+
"content": "{\"originalMessageId\":\"1727881360458\",\"originalMessageContent\":\"\\n<p>hello</p>\\n\",\"originalConversationId\":\"19:97641583cf154265a237da28ebbde27a@thread.v2\",\"originalSentDateTime\":\"2024-10-02T15:02:40.458+00:00\",\"originalMessageSender\":{\"application\":null,\"device\":null,\"user\":{\"userIdentityType\":\"aadUser\",\"tenantId\":\"2432b57b-0abd-43db-aa7b-16eadd115d34\",\"id\":\"28c10244-4bad-4fda-993c-f332faef94f0\",\"displayName\":null}}}",
734+
"name": null,
735+
"thumbnailUrl": null,
736+
"teamsAppId": null
737+
}
738+
],
739+
"mentions": [],
740+
"reactions": []
741+
}
742+
```
743+
661744
## Related content
662745

663746
- [List messages in a channel](channel-list-messages.md)

api-reference/beta/api/cloudlicensing-groupcloudlicensing-list-usagerights.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ Get a list of the [usageRight](../resources/cloudlicensing-usageright.md) object
1919

2020
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).
2121

22-
<!-- {
23-
"blockType": "permissions",
24-
"name": "cloudlicensing_groupcloudlicensing_list_usagerights"
25-
}
26-
-->
22+
<!-- { "blockType": "permissions", "name": "cloudlicensing_groupcloudlicensing_list_usagerights" } -->
2723
[!INCLUDE [permissions-table](../includes/permissions/cloudlicensing-groupcloudlicensing-list-usagerights-permissions.md)]
2824

2925
## HTTP request
@@ -76,6 +72,7 @@ The following example shows how to get all usage rights granted to a group.
7672
#### Request
7773

7874
The following example shows a request.
75+
# [HTTP](#tab/http)
7976
<!-- {
8077
"blockType": "request",
8178
"name": "cloudlicensing-groupusageright-list-example-1"
@@ -85,6 +82,12 @@ The following example shows a request.
8582
GET https://graph.microsoft.com/beta/groups/0003985b-dfc1-4f42-97d4-65f70a335ca8/cloudLicensing/usageRights
8683
```
8784

85+
# [JavaScript](#tab/javascript)
86+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudlicensing-groupusageright-list-example-1-javascript-snippets.md)]
87+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
88+
89+
---
90+
8891
#### Response
8992

9093
The following example shows the response.
@@ -126,6 +129,7 @@ The following example shows how to get all usage rights granted to a group for a
126129
#### Request
127130

128131
The following example shows a request.
132+
# [HTTP](#tab/http)
129133
<!-- {
130134
"blockType": "request",
131135
"name": "cloudlicensing-groupusageright-list-example-2"
@@ -135,6 +139,12 @@ The following example shows a request.
135139
GET https://graph.microsoft.com/beta/groups/0003985b-dfc1-4f42-97d4-65f70a335ca8/cloudLicensing/usageRights?$filter=services/any(c:c/planId eq 113feb6c-3fe4-4440-bddc-54d774bf0318)
136140
```
137141

142+
# [JavaScript](#tab/javascript)
143+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudlicensing-groupusageright-list-example-2-javascript-snippets.md)]
144+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
145+
146+
---
147+
138148
#### Response
139149

140150
The following example shows the response.

api-reference/beta/api/cloudlicensing-usageright-get.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ GET /me/cloudLicensing/usageRights/{usageRightId}
2727
GET /users/{userId}/cloudLicensing/usageRights/{usageRightId}
2828
```
2929

30-
<!-- { "blockType": "permissions", "name": "cloudlicensing_usageright_get", "requestUrls": "GET /users/{userId}/cloudLicensing/usageRights/{usageRightId}" } -->
31-
|Permission type|Least privileged permissions|Higher privileged permissions|
32-
|:---|:---|:---|
33-
|Delegated (work or school account)|User-UsageRight.Read|Directory.Read.All, Directory.ReadWrite.All, User-CloudLicensing.Read, User-CloudLicensing.Read.All, User-UsageRight.Read.All, User.Read, User.Read.All, User.ReadWrite, User.ReadWrite.All|
34-
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
35-
|Application|User-UsageRight.Read.All|Directory.Read.All, Directory.ReadWrite.All, User-CloudLicensing.Read.All, User.Read.All, User.ReadWrite.All|
30+
<!-- { "blockType": "permissions", "name": "cloudlicensing_usageright_get" } -->
31+
[!INCLUDE [permissions-table](../includes/permissions/cloudlicensing-usageright-get-permissions.md)]
3632

3733
Permissions to get a **usageRight** for a group:
3834

@@ -87,6 +83,7 @@ The following example shows how to get a usage right for a user.
8783
#### Request
8884

8985
The following example shows a request.
86+
# [HTTP](#tab/http)
9087
<!-- {
9188
"blockType": "request",
9289
"name": "cloudlicensing-usageright-get-example",
@@ -97,6 +94,12 @@ The following example shows a request.
9794
GET https://graph.microsoft.com/beta/users/48fbdf70-9e09-40df-9dbe-17af483ab113/cloudLicensing/usageRights/i6sq63x2vd3esbkifv7m42xdaugc6lfpqf3ozgvdlvk3ttnamby3
9895
```
9996

97+
# [JavaScript](#tab/javascript)
98+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudlicensing-usageright-get-example-javascript-snippets.md)]
99+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
100+
101+
---
102+
100103
#### Response
101104

102105
The following example shows the response.
@@ -134,6 +137,7 @@ The following example shows how to get a usage right for a group.
134137
#### Request
135138

136139
The following example shows a request.
140+
# [HTTP](#tab/http)
137141
<!-- {
138142
"blockType": "request",
139143
"name": "cloudlicensing-usageright-get-2-example",
@@ -144,6 +148,12 @@ The following example shows a request.
144148
GET https://graph.microsoft.com/beta/groups/1003985b-dfc1-4f42-97d4-65f70a335ca8/cloudLicensing/usageRights/j6sq63x2vd3esbkifv7m42xdaugc6lfpqf3ozgvdlvk3ttnamby4
145149
```
146150

151+
# [JavaScript](#tab/javascript)
152+
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudlicensing-usageright-get-2-example-javascript-snippets.md)]
153+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
154+
155+
---
156+
147157
#### Response
148158

149159
The following example shows the response.

0 commit comments

Comments
 (0)