Skip to content

Commit

Permalink
Merging changes synced from https://github.com/microsoftgraph/microso…
Browse files Browse the repository at this point in the history
…ft-graph-docs (branch live)
  • Loading branch information
Learn Build Service GitHub App authored and Learn Build Service GitHub App committed Apr 3, 2024
2 parents b8654d5 + 35bcb90 commit 336159f
Show file tree
Hide file tree
Showing 446 changed files with 8,934 additions and 2,391 deletions.
9 changes: 5 additions & 4 deletions api-reference/beta/api/appcatalogs-list-teamsapps.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Namespace: microsoft.graph
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]

List [apps](../resources/teamsapp.md) from the Microsoft Teams app catalog.
It includes apps from the Microsoft Teams store, and apps from your organization's app catalog (the tenant app catalog). To get apps from your organization's app catalog only, specify `organization` as the **distributionMethod** in the request.

This includes apps from the Microsoft Teams store and apps from your organization's app catalog (the tenant app catalog). To get apps from your organization's app catalog only, specify `organization` as the **distributionMethod** in the request.

> [!NOTE]
> In general, the **id** of a **teamsApp** resource is generated by the server. It is not the same as the **id** specified in a Teams app manifest, unless its **distributionMethod** is `store`. For other cases, the **id** provided by the developer as part of the Teams app manifest is stamped as the **externalId** in the **teamsApp** resource.
Expand All @@ -28,8 +29,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "appcatalogs_list_teamsapps" } -->
[!INCLUDE [permissions-table](../includes/permissions/appcatalogs-list-teamsapps-permissions.md)]

> **Note**:
The Directory.Read.All and Directory.ReadWrite.All permissions are supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission and avoid using these permissions going forward.
> [!NOTE]
> The Directory.Read.All and Directory.ReadWrite.All permissions are supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission and avoid using these permissions going forward.
## HTTP request

Expand Down Expand Up @@ -307,7 +308,7 @@ Content-Type: application/json

### Example 4: List applications with a given ID, and return the submission review state

The following example lists applications with a given ID, and expands **appDefinitions** to return the **publishingState**, which reflects the submission review state of the app. `Submitted` means the review is pending, `published` means the admin approved the app, and `rejected` means the the admin rejected the app.
The following example lists applications with a given ID, and expands **appDefinitions** to return the **publishingState**, which reflects the submission review state of the app. `Submitted` means the review is pending, `published` means the admin approved the app, and `rejected` means the admin rejected app.

#### Request

Expand Down
7 changes: 4 additions & 3 deletions api-reference/beta/api/application-post-calls.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "application_post_calls" } -->
[!INCLUDE [permissions-table](../includes/permissions/application-post-calls-permissions.md)]

> **Notes:**
> - For a call with app-hosted media, you need the Calls.AccessMedia.All permission in addition to one of the permissions listed in the previous table.
> - Cloud Video Interop solutions that are [Certified for Microsoft Teams](/MicrosoftTeams/cloud-video-interop) have permission to call this API to join meetings for which they have meeting join links, similar to external users joining through a browser.
> [!NOTE]
> - The Calls.JoinGroupCalls.Chat permission uses [resource-specific consent](/microsoftteams/platform/graph-api/rsc/resource-specific-consent).
> - For a call with app-hosted media, you need the Calls.AccessMedia.All permission in addition to one of the permissions listed in the previous table.
Cloud Video Interop solutions that are [Certified for Microsoft Teams](/MicrosoftTeams/cloud-video-interop) have permission to call this API to join meetings for which they have meeting join links, similar to external users joining through a browser.

## HTTP request
<!-- { "blockType": "ignored" } -->
Expand Down
5 changes: 3 additions & 2 deletions api-reference/beta/api/application-post-onlinemeetings.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "application_post_onlinemeetings" } -->
[!INCLUDE [permissions-table](../includes/permissions/application-post-onlinemeetings-permissions.md)]

To use the OnlineMeetings.ReadWrite.All application permission for this API, tenant administrators must create an [application access policy](/graph/cloud-communication-online-meeting-application-access-policy) and grant it to a user to authorize the app configured in the policy to create online meetings on behalf of that user (with user ID specified in the request path).
> [!NOTE]
> To use the OnlineMeetings.ReadWrite.All application permission for this API, tenant administrators must create an [application access policy](/graph/cloud-communication-online-meeting-application-access-policy) and grant it to a user to authorize the app configured in the policy to create online meetings on behalf of that user (with user ID specified in the request path).
## HTTP request

Expand All @@ -41,7 +42,7 @@ POST /users/{userId}/onlineMeetings
```

> [!NOTE]
>- **userId** is the object ID of a user in [Microsoft Entra admin center > user management page](https://entra.microsoft.com/#blade/Microsoft_AAD_IAM/UsersManagementMenuBlade). For more details, see [Allow applications to access online meetings on behalf of a user](/graph/cloud-communication-online-meeting-application-access-policy).
>- **userId** is the object ID of a user in [Microsoft Entra admin center > user management page](https://entra.microsoft.com/#blade/Microsoft_AAD_IAM/UsersManagementMenuBlade). For more information, see [Allow applications to access online meetings on behalf of a user](/graph/cloud-communication-online-meeting-application-access-policy).
## Request headers

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ If successful, this method returns a `204 No Content` response code.
### Request

The following example shows a request.
# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "delete_trainingcampaign"
Expand All @@ -64,6 +65,40 @@ The following example shows a request.
DELETE https://graph.microsoft.com/beta/security/attackSimulation/trainingCampaigns/{trainingCampaignId}
```

# [C#](#tab/csharp)
[!INCLUDE [sample-code](../includes/snippets/csharp/delete-trainingcampaign-csharp-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [CLI](#tab/cli)
[!INCLUDE [sample-code](../includes/snippets/cli/delete-trainingcampaign-cli-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Go](#tab/go)
[!INCLUDE [sample-code](../includes/snippets/go/delete-trainingcampaign-go-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Java](#tab/java)
[!INCLUDE [sample-code](../includes/snippets/java/delete-trainingcampaign-java-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [JavaScript](#tab/javascript)
[!INCLUDE [sample-code](../includes/snippets/javascript/delete-trainingcampaign-javascript-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PHP](#tab/php)
[!INCLUDE [sample-code](../includes/snippets/php/delete-trainingcampaign-php-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PowerShell](#tab/powershell)
[!INCLUDE [sample-code](../includes/snippets/powershell/delete-trainingcampaign-powershell-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Python](#tab/python)
[!INCLUDE [sample-code](../includes/snippets/python/delete-trainingcampaign-python-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

---


### Response

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ If successful, this method returns a `200 OK` response code and a collection of
### Request

The following example shows a request.
# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "list_trainingcampaign"
Expand All @@ -86,6 +87,40 @@ The following example shows a request.
GET https://graph.microsoft.com/beta/security/attackSimulation/trainingCampaigns
```

# [C#](#tab/csharp)
[!INCLUDE [sample-code](../includes/snippets/csharp/list-trainingcampaign-csharp-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [CLI](#tab/cli)
[!INCLUDE [sample-code](../includes/snippets/cli/list-trainingcampaign-cli-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Go](#tab/go)
[!INCLUDE [sample-code](../includes/snippets/go/list-trainingcampaign-go-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Java](#tab/java)
[!INCLUDE [sample-code](../includes/snippets/java/list-trainingcampaign-java-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [JavaScript](#tab/javascript)
[!INCLUDE [sample-code](../includes/snippets/javascript/list-trainingcampaign-javascript-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PHP](#tab/php)
[!INCLUDE [sample-code](../includes/snippets/php/list-trainingcampaign-php-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PowerShell](#tab/powershell)
[!INCLUDE [sample-code](../includes/snippets/powershell/list-trainingcampaign-powershell-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Python](#tab/python)
[!INCLUDE [sample-code](../includes/snippets/python/list-trainingcampaign-python-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

---


### Response

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ If successful, this method returns a `202 Accepted` response code and a tracking
### Request

The following example shows a request.
# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "create_trainingcampaign_from_"
Expand Down Expand Up @@ -139,6 +140,36 @@ Content-Type: application/json
}
```

# [C#](#tab/csharp)
[!INCLUDE [sample-code](../includes/snippets/csharp/create-trainingcampaign-from--csharp-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [CLI](#tab/cli)
[!INCLUDE [sample-code](../includes/snippets/cli/create-trainingcampaign-from--cli-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Java](#tab/java)
[!INCLUDE [sample-code](../includes/snippets/java/create-trainingcampaign-from--java-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [JavaScript](#tab/javascript)
[!INCLUDE [sample-code](../includes/snippets/javascript/create-trainingcampaign-from--javascript-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PHP](#tab/php)
[!INCLUDE [sample-code](../includes/snippets/php/create-trainingcampaign-from--php-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PowerShell](#tab/powershell)
[!INCLUDE [sample-code](../includes/snippets/powershell/create-trainingcampaign-from--powershell-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Python](#tab/python)
[!INCLUDE [sample-code](../includes/snippets/python/create-trainingcampaign-from--python-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

---

### Response

The following example shows the response.
Expand All @@ -151,4 +182,4 @@ The following example shows the response.

```http
HTTP/1.1 202 Accepted
```
```
44 changes: 38 additions & 6 deletions api-reference/beta/api/channel-archive.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@ A channel without an owner, or that belongs to a [group](../resources/group.md)
To restore a channel from its archived state, use the [unarchive](channel-unarchive.md) method. A channel can’t be archived or unarchived if its team is archived.

## Permissions
One of the following permissions is required to call this API. To learn more, including how to choose permissions, see [Permissions](/graph/permissions-reference).
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).

|Permission type | Permissions (from least to most privileged) |
|:--------------------|:---------------------------------------------------------|
|Delegated (work or school account) | ChannelSettings.ReadWrite.All |
|Delegated (personal Microsoft account) | Not supported. |
|Application | ChannelSettings.ReadWrite.All |
<!-- { "blockType": "permissions", "name": "channel_archive" } -->
[!INCLUDE [permissions-table](../includes/permissions/channel-archive-permissions.md)]

> **Note**: This API supports admin permissions. Global admins and Microsoft Teams service admins can access teams that they are not a member of.
Expand Down Expand Up @@ -69,6 +66,7 @@ The following example shows a request to archive a channel.

#### Request

# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "archive_channel"
Expand All @@ -77,6 +75,40 @@ The following example shows a request to archive a channel.
POST https://graph.microsoft.com/beta/teams/{team-id}/channels/{channel-id}/archive
```

# [C#](#tab/csharp)
[!INCLUDE [sample-code](../includes/snippets/csharp/archive-channel-csharp-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [CLI](#tab/cli)
[!INCLUDE [sample-code](../includes/snippets/cli/archive-channel-cli-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Go](#tab/go)
[!INCLUDE [sample-code](../includes/snippets/go/archive-channel-go-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Java](#tab/java)
[!INCLUDE [sample-code](../includes/snippets/java/archive-channel-java-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [JavaScript](#tab/javascript)
[!INCLUDE [sample-code](../includes/snippets/javascript/archive-channel-javascript-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PHP](#tab/php)
[!INCLUDE [sample-code](../includes/snippets/php/archive-channel-php-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [PowerShell](#tab/powershell)
[!INCLUDE [sample-code](../includes/snippets/powershell/archive-channel-powershell-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

# [Python](#tab/python)
[!INCLUDE [sample-code](../includes/snippets/python/archive-channel-python-snippets.md)]
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]

---

#### Response

The following example shows the response.
Expand Down
7 changes: 3 additions & 4 deletions api-reference/beta/api/channel-post-messages.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "channel_post_messages" } -->
[!INCLUDE [permissions-table](../includes/permissions/channel-post-messages-permissions.md)]

> **Note**: The Group.ReadWrite.All permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
> **Note**: Application permissions are *only* supported for [migration](/microsoftteams/platform/graph-api/import-messages/import-external-messages-to-teams).
In the future, Microsoft may require you or your customers to pay additional fees based on the amount of data imported.
> [!NOTE]
> - The Group.ReadWrite.All permission is supported only for backward compatibility. We recommend that you update your solutions to use an alternative permission listed in the previous table and avoid using these permissions going forward.
> - Application permissions are only supported for [migration](/microsoftteams/platform/graph-api/import-messages/import-external-messages-to-teams). In the future, Microsoft may require you or your customers to pay additional fees based on the amount of data imported.
<!-- markdownlint-disable MD024 -->
<!-- markdownlint-disable MD001 -->
Expand Down
Loading

0 comments on commit 336159f

Please sign in to comment.