Skip to content

Commit

Permalink
Merge pull request #23672 from microsoftgraph/main
Browse files Browse the repository at this point in the history
Merge to publish.
  • Loading branch information
Lauragra authored Feb 17, 2024
2 parents 5e2ec31 + ed9318a commit 3067700
Show file tree
Hide file tree
Showing 50 changed files with 314 additions and 217 deletions.
2 changes: 1 addition & 1 deletion api-reference/beta/api/channel-list-members.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GET /teams/{team-id}/channels/{channel-id}/members

## Optional query parameters

This operation does not support the [OData query parameters](/graph/query-parameters) to customize the response.
This method supports the `$filter`, `$select`, and `$top` [OData query parameters](/graph/query-parameters) to help customize the response. The default and maximum page sizes are 100 and 999 objects respectively.

## Request headers

Expand Down
4 changes: 2 additions & 2 deletions api-reference/beta/api/chatmessage-post.md
Original file line number Diff line number Diff line change
Expand Up @@ -476,13 +476,13 @@ Content-type: application/json
}
```

### Example 4: Send a message with file attachment in it
### Example 4: Send a message with a file attachment in it

#### Request
The following example shows a request.

>**Notes:**
> - The file must already be in SharePoint. To find the file properties, GET the **driveItem** for the file. For example: `/drives/{id}/items/{id}`. The attachment ID is the GUID in the **eTag** of the **driveItem**. The attachment **contentURL** is the **webUrl** of the **driveItem** folder plus the name of the **driveItem**. The attachment name is the name of the **driveItem**.
> - The file to attach must already be in SharePoint. To access the file properties, [GET the **driveItem** for the file](/graph/api/driveitem-get). The **eTag** of the **driveItem** has a GUID that is your attachment ID. The **webDavUrl** of the **driveItem** is your attachment **contentURL**. You can use the name of the **driveItem** as your attachment name. You can use /drives/{drive-id}/items/{item-id} to get a drive item resource. To get **webDavUrl**, you have to explicitly select it via $select=webDavUrl or $select=*,webDavUrl.
> - Microsoft Graph supports the `OpenUrl` card action. Bots are required for other card actions.
# [HTTP](#tab/http)
Expand Down
12 changes: 10 additions & 2 deletions api-reference/beta/api/event-get.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ This method supports the [OData query parameters](/graph/query-parameters) to he
|:-----------|:------|:----------|
| Authorization | string | Bearer {token}. Required. |
| Prefer: outlook.timezone | string | Use this to specify the time zone for start and end times in the response. If not specified, those time values are returned in UTC. Optional. |
| Prefer: outlook.body-content-type | string | The format of the **body** property to be returned in. Values can be "text" or "html". A `Preference-Applied` header is returned as confirmation if this `Prefer` header is specified. If the header is not specified, the **body** property is returned in HTML format. Optional. |
| Prefer: outlook.body-content-type | string | The format of the **body** property to be returned in. Values can be "text" or "html". A `Preference-Applied` header is returned as confirmation if this `Prefer` header is specified. If the header isn't specified, the **body** property is returned in HTML format. Optional. |

## Request body
Don't supply a request body for this method.
Expand Down Expand Up @@ -153,6 +153,8 @@ Preference-Applied: outlook.timezone="Pacific Standard Time"
"@odata.context":"https://graph.microsoft.com/beta/$metadata#users('cd209b0b-3f83-4c35-82d2-d88a61820480')/events(subject,body,bodyPreview,organizer,attendees,start,end,location,hideAttendees)/$entity",
"@odata.etag":"W/\"ZlnW4RIAV06KYYwlrfNZvQAAKGWwbw==\"",
"id":"AAMkAGIAAAoZDOFAAA=",
"iCalUId": "040000008200E00074=",
"uid": "040000008200E00074C=",
"subject":"Orientation ",
"bodyPreview":"Dana, this is the time you selected for our orientation. Please bring the notes I sent you.",
"body":{
Expand Down Expand Up @@ -293,6 +295,8 @@ Preference-Applied: outlook.body-content-type="text"
"@odata.context":"https://graph.microsoft.com/beta/$metadata#users('cd209b0b-3f83-4c35-82d2-d88a61820480')/events(subject,body,bodyPreview)/$entity",
"@odata.etag":"W/\"ZlnW4RIAV06KYYwlrfNZvQAAKGWwbw==\"",
"id":"AAMkAGI1AAAoZDOFAAA=",
"iCalUId": "040000008200E00074=",
"uid": "040000008200E00074C=",
"subject":"Orientation ",
"bodyPreview":"Dana, this is the time you selected for our orientation. Please bring the notes I sent you.",
"body":{
Expand Down Expand Up @@ -354,6 +358,7 @@ GET https://graph.microsoft.com/beta/me/events/AAMkADAGAADDdm4NAAA=?$select=subj
---

#### Response

Here is an example of the response. The **locations** property includes details for the 3 locations that the event is organized for.

Because the request does not specify any `Prefer: outlook.timezone` or `Prefer: outlook.body-content-type` header,
Expand All @@ -373,6 +378,8 @@ Content-type: application/json
"@odata.context":"https://graph.microsoft.com/beta/$metadata#users('d1a2fae9-db66-4cc9-8133-2184c77af1b8')/events(subject,body,bodyPreview,organizer,attendees,start,end,location,locations)/$entity",
"@odata.etag":"W/\"y53lbKh6jkaxHzFwGhgyxgAAw5zhug==\"",
"id":"AAMkADAGAADDdm4NAAA=",
"iCalUId": "040000008200E00074=",
"uid": "040000008200E00074C=",
"subject":"Plan summer company picnic",
"bodyPreview":"Let's kick-start this event planning!",
"body":{
Expand Down Expand Up @@ -460,7 +467,6 @@ Content-type: application/json

The following example shows expanding a series master event of a recurring series with exceptions and cancelled occurences. The request specifies a `$select` query parameter to return specific properties.


# [HTTP](#tab/http)
<!-- {
"blockType": "request",
Expand Down Expand Up @@ -522,6 +528,8 @@ Content-type: application/json
"@odata.context":"https://graph.microsoft.com/beta/$metadata#users('d1a2fae9-db66-4cc9-8133-2184c77af1b8')/events(subject,start,end,occurrenceId,exceptionOccurrences,cancelledOccurrences)/$entity",
"@odata.etag":"W/\"y53lbKh6jkaxHzFwGhgyxgAAw5zhug==\"",
"id":"AAMkADAGAADDdm4NAAA=",
"iCalUId": "040000008200E00074=",
"uid": "040000008200E00074C=",
"subject": "Daily stand-up",
"cancelledOccurrences": [
"OID.AAMkADAGAADDdm4NAAA=.2020-04-30",
Expand Down
50 changes: 8 additions & 42 deletions api-reference/beta/api/event-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,10 @@ If successful, this method returns a `200 OK` response code and updated [event](
## Example

##### Request
### Request

Here is an example of the request.
The following example shows a request.

# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "update_event"
Expand All @@ -121,8 +120,7 @@ Content-type: application/json
"response": "",
"time": "2016-10-19T10:37:00Z"
},
"recurrence": null,
"uid": "iCalUId-value",
"recurrence": null,
"reminderMinutesBeforeStart": 99,
"isOnlineMeeting": true,
"onlineMeetingProvider": "teamsForBusiness",
Expand All @@ -132,43 +130,10 @@ Content-type: application/json
}
```

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

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

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

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

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

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

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

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

---

##### Response
### Response

Here is an example of the response. Note: The response object shown here might be shortened for readability.
The following example shows the response.
>**Note:** The response object shown here might be shortened for readability.
<!-- {
"blockType": "response",
Expand All @@ -187,7 +152,8 @@ Content-type: application/json
"time": "2016-10-19T10:37:00Z"
},
"recurrence": null,
"uid": "iCalUId-value",
"iCalUId": "040000008200E00074=",
"uid": "040000008200E00074=",
"reminderMinutesBeforeStart": 99,
"isOnlineMeeting": true,
"onlineMeetingProvider": "teamsForBusiness",
Expand Down
16 changes: 16 additions & 0 deletions api-reference/beta/api/group-delete-owners.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,22 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "group_delete_owners" } -->
[!INCLUDE [permissions-table](../includes/permissions/group-delete-owners-permissions.md)]

The signed-in user must also be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):

| Microsoft Entra role | Limitations |
|----------------------------------|------------------------------------------------|
| User Administrator | Can modify user owners only |
| Directory Writers | Can modify user owners only |
| Groups Administrator | Can modify all types of group owners |
| Exchange Service Administrator | Can modify owners of Microsoft 365 groups only |
| SharePoint Service Administrator | Can modify owners of Microsoft 365 groups only |
| Teams Administrator | Can modify owners of Microsoft 365 groups only |
| Yammer Administrator | Can modify owners of Microsoft 365 groups only |
| Intune Administrator | Can modify owners of security groups only |
| Knowledge Administrator | Can modify owners of security groups only |
| Knowledge Manager | Can modify owners of security groups only |
| Windows 365 Administrator | Can modify owners of security groups only |

## HTTP request

<!-- { "blockType": "ignored" } -->
Expand Down
4 changes: 2 additions & 2 deletions api-reference/beta/api/group-post-members.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Add a member to a security or Microsoft 365 group through the **members** naviga
The following table shows the least privileged permission that's required by each resource type when calling this API. To learn more, including how to choose permissions, see [Permissions](/graph/permissions-reference).

| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
|:-------------------------------------------|:---------------------------------------------------------|:----------------------------------------|:---------------------------------------------------------|
|:------------------------------------------|:--------------------------------------------------------|:---------------------------------------|:--------------------------------------------------------|
| [device](../resources/device.md) | GroupMember.ReadWrite.All and Device.ReadWrite.All | Not supported. | GroupMember.ReadWrite.All and Device.ReadWrite.All |
| [group](../resources/group.md) | GroupMember.ReadWrite.All and Group.ReadWrite.All | Not supported. | GroupMember.ReadWrite.All and Group.ReadWrite.All |
| [orgContact](../resources/device.md) | GroupMember.ReadWrite.All and OrgContact.Read.All | Not supported. | GroupMember.ReadWrite.All and OrgContact.Read.All |
| [servicePrincipal](../resources/group.md) | GroupMember.ReadWrite.All and Application.ReadWrite.All | Not supported. | GroupMember.ReadWrite.All and Application.ReadWrite.All |
| [user](../resources/user.md) | GroupMember.ReadWrite.All and User.ReadWrite.All | Not supported. | GroupMember.ReadWrite.All and User.ReadWrite.All |
| [user](../resources/user.md) | GroupMember.ReadWrite.All | Not supported. | GroupMember.ReadWrite.All |

> [!IMPORTANT]
> To add members to a role-assignable group, the calling user must also be assigned the _RoleManagement.ReadWrite.Directory_ permission.
Expand Down
16 changes: 16 additions & 0 deletions api-reference/beta/api/group-post-owners.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "group_post_owners" } -->
[!INCLUDE [permissions-table](../includes/permissions/group-post-owners-permissions.md)]

The signed-in user must also be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):

| Microsoft Entra role | Limitations |
|----------------------------------|------------------------------------------------|
| User Administrator | Can modify user owners only |
| Directory Writers | Can modify user owners only |
| Groups Administrator | Can modify all types of group owners |
| Exchange Service Administrator | Can modify owners of Microsoft 365 groups only |
| SharePoint Service Administrator | Can modify owners of Microsoft 365 groups only |
| Teams Administrator | Can modify owners of Microsoft 365 groups only |
| Yammer Administrator | Can modify owners of Microsoft 365 groups only |
| Intune Administrator | Can modify owners of security groups only |
| Knowledge Administrator | Can modify owners of security groups only |
| Knowledge Manager | Can modify owners of security groups only |
| Windows 365 Administrator | Can modify owners of security groups only |

## HTTP request

<!-- { "blockType": "ignored" } -->
Expand Down
4 changes: 2 additions & 2 deletions api-reference/beta/api/organization-list.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ One of the following permissions is required to call this API. To learn more, in
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
|Permission type | Permissions (from least to most privileged) |
|:--------------------|:---------------------------------------------------------|
|Delegated (work or school account) | User.Read, Directory.Read.All, Directory.ReadWrite.All |
|Delegated (work or school account) | User.Read, Organization.Read.All, Directory.Read.All, Organization.ReadWrite.All, Directory.ReadWrite.All |
|Delegated (personal Microsoft account) | Not supported. |
|Application | Directory.Read.All, Directory.ReadWrite.All |
|Application | Organization.Read.All, Directory.Read.All, Organization.ReadWrite.All, Directory.ReadWrite.All |

[!INCLUDE [rbac-organization-apis-read](../includes/rbac-for-apis/rbac-organization-apis-read.md)]

Expand Down
2 changes: 1 addition & 1 deletion api-reference/beta/api/team-list-members.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ GET /teams/{team-id}/members
```

## Optional query parameters
This method supports the `$filter` and `$select` [OData query parameters](/graph/query-parameters) to help customize the response.
This method supports the `$filter`, `$select`, and `$top` [OData query parameters](/graph/query-parameters) to help customize the response. The default and maximum page sizes are 100 and 999 objects respectively.

## Request headers
|Name|Description|
Expand Down
Loading

0 comments on commit 3067700

Please sign in to comment.