Skip to content

Commit 8a5309d

Browse files
DanielabomDanielabom
authored
Merge pull request #26044 from microsoftgraph/main
Merge to publish.
2 parents 4aa76a2 + 860fd52 commit 8a5309d

File tree

59 files changed

+219
-273
lines changed

Some content is hidden

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

59 files changed

+219
-273
lines changed

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"githubPullRequests.ignoredPullRequestBranches": [
3+
"main",
34
"main",
45
"main"
56
],

‎api-reference/beta/api/authentication-delete-hardwareoathmethods.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@ Unassign a [hardware token](../resources/hardwareoathauthenticationmethod.md) fr
2323
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).
2424

2525
### Permissions acting on self
26-
<!-- {
27-
"blockType": "permissions",
28-
"name": "authentication-delete-hardwareoathmethods-permissions"
29-
}
30-
-->
31-
<!-- { "blockType": "permissions", "name": "authentication_delete_hardwareoathmethods" } -->
26+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3227
[!INCLUDE [permissions-table](../includes/permissions/authentication-delete-hardwareoathmethods-permissions.md)]
3328

3429
## Permissions acting on other users
35-
<!-- {
36-
"blockType": "permissions",
37-
"name": "authentication-delete-hardwareoathmethods-2-permissions"
38-
}
39-
-->
30+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
4031
[!INCLUDE [permissions-table](../includes/permissions/authentication-delete-hardwareoathmethods-2-permissions.md)]
4132

4233
[!INCLUDE [rbac-authentication-methods-apis-write-others](../includes/rbac-for-apis/rbac-authentication-methods-apis-write-others.md)]

‎api-reference/beta/api/authentication-list-hardwareoathmethods.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ Get a list of the [hardware tokens](../resources/hardwareoathauthenticationmetho
2323
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).
2424

2525
### Permissions acting on self
26-
<!-- { "blockType": "permissions", "name": "authentication_list_hardwareoathmethods" } -->
26+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
2727
[!INCLUDE [permissions-table](../includes/permissions/authentication-list-hardwareoathmethods-permissions.md)]
2828

2929
### Permissions acting on other users
30-
<!-- { "blockType": "permissions", "name": "authentication_list_hardwareoathmethods_2" } -->
30+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3131
[!INCLUDE [permissions-table](../includes/permissions/authentication-list-hardwareoathmethods-2-permissions.md)]
3232

3333
[!INCLUDE [rbac-authentication-methods-apis-read-others](../includes/rbac-for-apis/rbac-authentication-methods-apis-read-others.md)]

‎api-reference/beta/api/authentication-post-hardwareoathmethods.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,11 @@ Assign a [hardware token](../resources/hardwareoathauthenticationmethod.md) to a
2323
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).
2424

2525
## Permissions acting on self
26-
<!-- { "blockType": "permissions", "name": "authentication_post_hardwareoathmethods" } -->
26+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
2727
[!INCLUDE [permissions-table](../includes/permissions/authentication-post-hardwareoathmethods-permissions.md)]
2828

2929
## Permissions acting on other users
30-
<!-- {
31-
"blockType": "permissions",
32-
"name": "authentication-post-hardwareoathmethods-2-permissions"
33-
}
34-
-->
30+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3531
[!INCLUDE [permissions-table](../includes/permissions/authentication-post-hardwareoathmethods-2-permissions.md)]
3632

3733
[!INCLUDE [rbac-authentication-methods-apis-write-others](../includes/rbac-for-apis/rbac-authentication-methods-apis-write-others.md)]

‎api-reference/beta/api/authenticationmethoddevice-delete-hardwareoathdevices.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ Delete a Hardware OATH token. Token needs to be unassigned.
2222

2323
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).
2424

25-
<!-- {
26-
"blockType": "permissions",
27-
"name": "authenticationmethoddevice-delete-hardwareoathdevices-permissions"
28-
}
29-
-->
25+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3026
[!INCLUDE [permissions-table](../includes/permissions/authenticationmethoddevice-delete-hardwareoathdevices-permissions.md)]
3127

3228
[!INCLUDE [rbac-authentication-methods-policy-apis-write](../includes/rbac-for-apis/rbac-authentication-methods-policy-apis-write.md)]

‎api-reference/beta/api/authenticationmethoddevice-list-hardwareoathdevices.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ List all hardware OATH tokens in the directory.
2222

2323
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).
2424

25-
<!-- {
26-
"blockType": "permissions",
27-
"name": "authenticationmethoddevice-list-hardwareoathdevices-permissions"
28-
}
29-
-->
25+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3026
[!INCLUDE [permissions-table](../includes/permissions/authenticationmethoddevice-list-hardwareoathdevices-permissions.md)]
3127

3228
[!INCLUDE [rbac-authentication-methods-policy-apis-read](../includes/rbac-for-apis/rbac-authentication-methods-policy-apis-read.md)]

‎api-reference/beta/api/authenticationmethoddevice-post-hardwareoathdevices.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ Create a new hardwareOathTokenAuthenticationMethodDevice object. You can optiona
2222

2323
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).
2424

25-
<!-- {
26-
"blockType": "permissions",
27-
"name": "authenticationmethoddevice-post-hardwareoathdevices-permissions"
28-
}
29-
-->
25+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3026
[!INCLUDE [permissions-table](../includes/permissions/authenticationmethoddevice-post-hardwareoathdevices-permissions.md)]
3127

3228
[!INCLUDE [rbac-authentication-methods-policy-apis-write](../includes/rbac-for-apis/rbac-authentication-methods-policy-apis-write.md)]

‎api-reference/beta/api/authenticationmethoddevice-update.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ Create a new hardwareOathTokenAuthenticationMethodDevice object. Supports bulk c
2020

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

23-
<!-- {
24-
"blockType": "permissions",
25-
"name": "authenticationmethoddevice-post-hardwareoathdevices-permissions"
26-
}
27-
-->
23+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
2824
[!INCLUDE [permissions-table](../includes/permissions/authenticationmethoddevice-post-hardwareoathdevices-permissions.md)]
2925

3026
[!INCLUDE [rbac-authentication-methods-policy-apis-write](../includes/rbac-for-apis/rbac-authentication-methods-policy-apis-write.md)]

‎api-reference/beta/api/chatmessage-post.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ If successful, this method returns a `201 Created` response code and a new [chat
7878

7979
In the following examples, the URL can use the [HTTP syntax](#http-request) described to [send a message to a chat](chat-post-messages.md), [send a message to a channel](channel-post-messages.md), or [send reply to a channel](chatmessage-post-replies.md).
8080

81+
> [!NOTE]
82+
> The Teams client has specific HTML restrictions. Therefore, the HTML elements supported by the Microsoft Graph API are compatible with the Teams client. For example, certain elements like `<div>` and inline styles may not function as intended.
83+
8184
### Example 1: Send a Hello World message in a channel
8285

8386
#### Request
@@ -764,7 +767,7 @@ Content-type: application/json
764767
{
765768
"body": {
766769
"contentType": "html",
767-
"content": "<div><div>\n<div><span><img height=\"297\" src=\"../hostedContents/1/$value\" width=\"297\" style=\"vertical-align:bottom; width:297px; height:297px\"></span>\n\n</div>\n\n\n</div>\n</div>"
770+
"content": "<img height=\"297\" src=\"../hostedContents/1/$value\" width=\"297\">"
768771
},
769772
"hostedContents":[
770773
{
@@ -855,7 +858,7 @@ Content-type: application/json
855858
},
856859
"body": {
857860
"contentType": "html",
858-
"content": "<div><div><div><span><img height=\"297\" src=\"https://graph.microsoft.com/beta/chats/19:2da4c29f6d7041eca70b638b43d45437@thread.v2/messages/1616991962672/hostedContents/aWQ9eF8wLXd1cy1kNy1kZTczYzM0YTYzZGVkYjViMDVlNjYyY2Y1NzQ5MGU5Yyx0eXBlPTEsdXJsPWh0dHBzOi8vdXMtYXBpLmFzbS5za3lwZS5jb20vdjEvb2JqZWN0cy8wLXd1cy1kNy1kZTczYzM0YTYzZGVkYjViMDVlNjYyY2Y1NzQ5MGU5Yy92aWV3cy9pbWdv/$value\" width=\"297\" style=\"vertical-align:bottom; width:297px; height:297px\"></span></div></div></div>"
861+
"content": "<img height=\"297\" src=\"https://graph.microsoft.com/v1.0/chats/19:97641583cf154265a237da28ebbde27a@thread.v2/messages/1736180156294/hostedContents/aWQ9eF8wLWV1cy1kMTQtYjUxMDlhMDhkODZkM2ZjODBkNzFlYjUzMWM4ZDlmZGEsdHlwZT0xLHVybD1odHRwczovL3VzLWFwaS5hc20uc2t5cGUuY29tL3YxL29iamVjdHMvMC1ldXMtZDE0LWI1MTA5YTA4ZDg2ZDNmYzgwZDcxZWI1MzFjOGQ5ZmRhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\" width=\"297\">"
859862
},
860863
"attachments": [],
861864
"mentions": [],
@@ -1034,7 +1037,7 @@ Content-type: application/json
10341037
{
10351038
"body": {
10361039
"contentType": "html",
1037-
"content": "<div><div><at id=\"0\">General</at>&nbsp;Hello there!</div></div>"
1040+
"content": "<at id=\"0\">General</at>&nbsp;Hello there!"
10381041
},
10391042
"mentions": [
10401043
{
@@ -1130,7 +1133,7 @@ Content-type: application/json
11301133
},
11311134
"body": {
11321135
"contentType": "html",
1133-
"content": "<div><div><at id=\"0\">General</at>&nbsp;Hello there!</div></div>"
1136+
"content": "<at id=\"0\">General</at>&nbsp;Hello there!"
11341137
},
11351138
"channelIdentity": {
11361139
"teamId": "68a3e365-f7d9-4a56-b499-24332a9cc572",
@@ -1180,7 +1183,7 @@ Content-type: application/json
11801183
{
11811184
"body": {
11821185
"contentType": "html",
1183-
"content": "<div><div><at id=\"0\">GraphTesting</at>&nbsp;Hello team</div></div>"
1186+
"content": "<at id=\"0\">GraphTesting</at>&nbsp;Hello team"
11841187
},
11851188
"mentions": [
11861189
{
@@ -1278,7 +1281,7 @@ Content-type: application/json
12781281
},
12791282
"body": {
12801283
"contentType": "html",
1281-
"content": "<div><div><at id=\"0\">GraphTesting</at>&nbsp;Hello team</div></div>"
1284+
"content": "<at id=\"0\">GraphTesting</at>&nbsp;Hello team"
12821285
},
12831286
"channelIdentity": {
12841287
"teamId": "68a3e365-f7d9-4a56-b499-24332a9cc572",
@@ -1326,7 +1329,7 @@ Content-type: application/json
13261329
{
13271330
"body": {
13281331
"contentType": "html",
1329-
"content": "<div><div><at id=\"0\">TestTag</at>&nbsp;Testing Tags</div></div>"
1332+
"content": "<at id=\"0\">TestTag</at>&nbsp;Testing Tags"
13301333
},
13311334
"mentions": [
13321335
{
@@ -1421,7 +1424,7 @@ Content-type: application/json
14211424
},
14221425
"body": {
14231426
"contentType": "html",
1424-
"content": "<div><div><at id=\"0\">TestTag</at>&nbsp;Testing Tags</div></div>"
1427+
"content": "<at id=\"0\">TestTag</at>&nbsp;Testing Tags"
14251428
},
14261429
"channelIdentity": {
14271430
"teamId": "fbe2bf47-16c8-47cf-b4a5-4b9b187c508b",
@@ -1623,7 +1626,7 @@ Content-type: application/json
16231626
"id": "d7ddbf876ae340c3a03bada395ec7da7",
16241627
"contentType": "application/vnd.microsoft.teams.messaging-announcementBanner",
16251628
"contentUrl": null,
1626-
"content": "{\"title\":\"Announcement heading\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"../hostedContents/1/$value\",\"width\":1379,\"height\":268,\"croppedWidth\":918.0,\"croppedHeight\":178.4075416968818,\"leftMargin\":0.0,\"topMargin\":90.7962291515591,\"imageContentType\":\"image/png\"},\"croppedImage\":{\"source\":\"../hostedContents/2/$value\"}}}}",
1629+
"content": "{\"title\":\"\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"../hostedContents/2/$value\",\"imageContentType\":\"image/jpg\"},\"croppedImage\":{\"source\":\"../hostedContents/1/$value\"}}}}",
16271630
"name": null,
16281631
"thumbnailUrl": null
16291632
}
@@ -1731,7 +1734,7 @@ Content-type: application/json
17311734
"id": "d7ddbf876ae340c3a03bada395ec7da7",
17321735
"contentType": "application/vnd.microsoft.teams.messaging-announcementBanner",
17331736
"contentUrl": null,
1734-
"content": "{\"title\":\"Announcement heading\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19:81f49626414645c99469ee65a1a7e1a4@thread.tacv2/messages/1675104302171/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQyLTY3OTJlM2ExMzFmNzc4YjY5NWMwYTE5ZGRkZmIwYWNiL3ZpZXdzL2ltZ28=/$value\",\"width\":1379,\"height\":268,\"croppedWidth\":918.0,\"croppedHeight\":178.4075416968818,\"leftMargin\":0.0,\"topMargin\":90.7962291515591,\"imageContentType\":\"image/png\"},\"croppedImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19:81f49626414645c99469ee65a1a7e1a4@thread.tacv2/messages/1675104302171/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQzLTAwYjhhNWZiZTA0MGRmY2MzMWZkNzM1ZDE4Yjk4NTM5L3ZpZXdzL2ltZ28=/$value\"}}}}",
1737+
"content": "{\"title\":\"Test title\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19%3A81f49626414645c99469ee65a1a7e1a4%40thread.tacv2/messages/1736180726031/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQ5LTEzMzNjYzJhOWFlYTdjOWYwMWJmNjc2YWU5YWE3NTdhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\",\"width\":1317,\"height\":366,\"croppedWidth\":1317.0,\"croppedHeight\":366.0,\"leftMargin\":0.0,\"topMargin\":0.0},\"croppedImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19%3A81f49626414645c99469ee65a1a7e1a4%40thread.tacv2/messages/1736180726031/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQ5LTEzMzNjYzJhOWFlYTdjOWYwMWJmNjc2YWU5YWE3NTdhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\"}}}}",
17351738
"name": null,
17361739
"thumbnailUrl": null,
17371740
"teamsAppId": null

‎api-reference/beta/api/hardwareoathauthenticationmethod-activate.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,11 @@ Activate a [hardware OATH token](../resources/hardwareoathauthenticationmethod.m
2323
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).
2424

2525
## Permissions acting on self
26-
<!-- { "blockType": "permissions", "name": "hardwareoathauthenticationmethod_activate" } -->
26+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
2727
[!INCLUDE [permissions-table](../includes/permissions/hardwareoathauthenticationmethod-activate-permissions.md)]
2828

2929
## Permissions acting on other users
30-
<!-- {
31-
"blockType": "permissions",
32-
"name": "hardwareoathauthenticationmethod-activate-2-permissions"
33-
}
34-
-->
30+
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
3531
[!INCLUDE [permissions-table](../includes/permissions/hardwareoathauthenticationmethod-activate-2-permissions.md)]
3632

3733
[!INCLUDE [rbac-authentication-methods-apis-write-others](../includes/rbac-for-apis/rbac-authentication-methods-apis-write-others.md)]

0 commit comments

Comments
 (0)