Skip to content

Commit

Permalink
Merge pull request #25659 from microsoftgraph/main
Browse files Browse the repository at this point in the history
Merge to publish.
  • Loading branch information
Lauragra authored Nov 12, 2024
2 parents 11fa640 + 2b802c3 commit 350556b
Show file tree
Hide file tree
Showing 118 changed files with 2,963 additions and 284 deletions.
62 changes: 40 additions & 22 deletions api-reference/beta/api/appmanagementpolicy-post.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ POST /policies/appManagementPolicies

> [!IMPORTANT]
> Service principals with a createdDateTime `null` are treated as having being created on 01/01/2019.
## Request body

In the request body, supply a JSON representation of the [appManagementPolicy](../resources/appmanagementpolicy.md) object.
Expand All @@ -53,7 +54,7 @@ You can specify the following properties when creating an **appManagementPolicy*
| :----------- | :---------------------------------------------------------- | :--------------------------------------------------------------------- |
| displayName | String | The display name of the policy. Required. |
| description | String | The description of the policy. Required. |
| isEnabled | Boolean | Denotes whether the policy is enabled. Optional. |
| isEnabled | Boolean | Denotes whether the policy is enabled. Optional. |
| restrictions | [appManagementConfiguration](../resources/appManagementConfiguration.md) | Restrictions that apply to an application or service principal object. Optional. |

## Response
Expand All @@ -67,9 +68,10 @@ If successful, this method returns a `201 Created` response code with the new [a
The following example shows a request. This request created an app management policy with the following settings:

- Enables the policy.
- Blocks creating of new passwords for applications and service principals created on or after 2019-10-19 at 10:37 AM UTC time.
- Enforces lifetime on password secrets and key credentials for applications created on or after 2014-10-19 at 10:37 AM UTC time.
- Limits password secrets for apps and service principals created after 2019-10-19 at 10:37 AM UTC time to less than 4 days, 12 hours, 30 minutes and 5 seconds.
- Blocks creating of new passwords for applications and service principals created on or after October 19th 2019 at 10:37 AM UTC time.
- Limits password secrets for apps and service principals created after October 19th 2014 at 10:37 AM UTC time to less than 90 days.
- Disables the nonDefaultUriAddition restriction. This means that apps with this policy applied to them can add new nondefault identifier URIs to their apps, even if the tenant default policy typically blocks it.
- Doesn't specify any other restrictions. This means that the behavior for those restrictions on apps/service principals with this policy applied falls back to however the tenant default policy is configured.


# [HTTP](#tab/http)
Expand All @@ -89,45 +91,35 @@ POST https://graph.microsoft.com/beta/policies/appManagementPolicies
"passwordCredentials": [
{
"restrictionType": "passwordAddition",
"state": "enabled",
"maxLifetime": null,
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
},
{
"restrictionType": "passwordLifetime",
"state": "enabled",
"maxLifetime": "P90D",
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
},
{
"restrictionType": "symmetricKeyAddition",
"state": "enabled",
"maxLifetime": null,
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
},
{
"restrictionType": "symmetricKeyLifetime",
"maxLifetime": "P30D",
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
}
],
"keyCredentials": [
{
"restrictionType": "asymmetricKeyLifetime",
"state": "enabled",
"maxLifetime": "P90D",
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
},
{
"restrictionType": "trustedCertificateAuthority",
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z",
"certificateBasedApplicationConfigurationIds": [
"eec5ba11-2fc0-4113-83a2-ed986ed13743",
"bb8e164b-f9ed-4b98-bc45-65eddc14f4c1"
],
"maxLifetime": null
}
],
"keyCredentials": [],
"applicationRestrictions": {
"identifierUris": {
"nonDefaultUriAddition": {
"restrictForAppsCreatedAfterDateTime": "2024-01-01T10:37:00Z",
"state": "disabled",
"restrictForAppsCreatedAfterDateTime": null,
"excludeAppsReceivingV2Tokens": true,
"excludeSaml": true
}
Expand Down Expand Up @@ -186,6 +178,7 @@ The following example shows the response.
HTTP/1.1 200 OK
Content-type: application/json
{
"@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/appManagementPolicies/$entity",
"id": "a4ab1ed9-46bb-4bef-88d4-86fd6398dd5d",
Expand All @@ -196,15 +189,40 @@ Content-type: application/json
"passwordCredentials": [
{
"restrictionType": "passwordAddition",
"state": "enabled",
"maxLifetime": null,
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
},
{
"restrictionType": "passwordLifetime",
"state": "enabled",
"maxLifetime": "P90D",
"restrictForAppsCreatedAfterDateTime": "2018-10-19T10:37:00Z"
},
{
"restrictionType": "symmetricKeyAddition",
"state": "enabled",
"maxLifetime": null,
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
},
{
"restrictionType": "symmetricKeyLifetime",
"state": "enabled",
"maxLifetime": "P90D",
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
}
]
],
"keyCredentials": [],
"applicationRestrictions": {
"identifierUris": {
"nonDefaultUriAddition": {
"state": "disabled",
"restrictForAppsCreatedAfterDateTime": null,
"excludeAppsReceivingV2Tokens": true,
"excludeSaml": true
}
}
}
}
}
```
Expand Down
6 changes: 4 additions & 2 deletions api-reference/beta/api/cloudpcprovisioningpolicy-apply.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ The following table shows the parameter that you can use with this method.

|Parameter|Type|Description|
|:---|:---|:---|
|policySettings|cloudPcPolicySettingType|The target property of this apply action. Possible values are: `region`, `singleSignOn`, `unknownFutureValue`. The default value is `region`. This action applies `region` as a value if this parameter is `null`.|
|policySettings|cloudPcPolicySettingType|The target property of the apply action. Possible values are: `region`, `singleSignOn`, `unknownFutureValue`. The default value is `region`. This action applies `region` as a value if this parameter is `null`.|
|reservePercentage|Int32|For `Frontline shared` only. The percentage of Cloud PCs to keep available. Administrators can set this property to a value from 0 to 99. Cloud PCs are reprovisioned only when there are no active and connected Cloud PC users.|

## Response

Expand All @@ -74,7 +75,8 @@ POST https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/provision
Content-Type: application/json
{
"policySettings": "region"
"policySettings": "region",
"reservePercentage": 80,
}
```

Expand Down
98 changes: 98 additions & 0 deletions api-reference/beta/api/copilotadminlimitedmode-get.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
---
title: "Get copilotAdminLimitedMode"
description: "Read the properties and relationships of a copilotAdminLimitedMode object."
author: "gautamjain14"
ms.localizationpriority: medium
ms.subservice: "meetings-copilot"
doc_type: apiPageType
---

# Get copilotAdminLimitedMode

Namespace: microsoft.graph

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

Read the properties and relationships of a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object.

## Permissions

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

<!-- {
"blockType": "permissions",
"name": "copilotadminlimitedmode-get-permissions"
}
-->
> **Note:** Global admin or Global reader permission is required to call this API.
|Permission type |Least privileged permissions|Higher privileged permissions|
| --------------- |-----------------------------| --------------------------- |
|Delegated (work or school account)|CopilotSettings-LimitedMode.Read|CopilotSettings-LimitedMode.ReadWrite|
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
|Application|Not supported.Not supported.|


## HTTP request

<!-- {
"blockType": "ignored"
}
-->
``` http
GET /copilot/admin/settings/limitedMode
```
## Request headers

|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|

## Request body

Don't supply a request body for this method.

## Response

If successful, this method returns a `200 OK` response code and a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object in the response body.

The API can return more HTTP status codes: `403 Forbidden`, `500 Internal Server Error`, or `429 Too Many Requests`.

## Examples

### Request

The following example shows a request.
<!-- {
"blockType": "request",
"name": "get_copilotadminlimitedmode"
}
-->
``` http
GET https://graph.microsoft.com/beta/copilot/admin/settings/limitedMode
```


### Response

The following example shows the response.
>**Note:** The response object shown here might be shortened for readability.
<!-- {
"blockType": "response",
"truncated": true,
"@odata.type": "microsoft.graph.copilotAdminLimitedMode"
}
-->
``` http
HTTP/1.1 200 OK
Content-Type: application/json
{
"value": {
"@odata.type": "#microsoft.graph.copilotAdminLimitedMode",
"isEnabledForGroup": "Boolean",
"groupId": "String"
}
}
```

100 changes: 100 additions & 0 deletions api-reference/beta/api/copilotadminlimitedmode-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
---
title: "Update copilotAminLimitedMode"
description: "Update the properties of a copilotAdminLimitedMode object."
author: "gautamjain14"
ms.localizationpriority: medium
ms.subservice: "meetings-copilot"
doc_type: apiPageType
---

# Update copilotAdminLimitedMode

Namespace: microsoft.graph

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

Update the properties of a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object.

## Permissions

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

<!-- {
"blockType": "permissions",
"name": "copilotadminlimitedmode-update-permissions"
}
-->
> **Note:** Global admin or Global reader permission is required to call this API.
|Permission type |Least privileged permissions|Higher privileged permissions|
| --------------- |-----------------------------| --------------------------- |
|Delegated (work or school account)|CopilotSettings-LimitedMode.ReadWrite| Not available.|
|Delegated (personal Microsoft account)|Not supported.|Not supported.|
|Application|Not supported.|Not supported.|

## HTTP request

<!-- {
"blockType": "ignored"
}
-->
``` http
PATCH /copilot/admin/settings/limitedMode
```

## Request headers

|Name|Description|
|:---|:---|
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
|Content-Type|application/json. Required.|

## Request body

|Property|Type|Description|
|:---|:---|:---|
|isEnabledForGroup|Boolean|Enables the user to be in limited mode for Copilot in Teams meetings. When copilotLimitedMode=true, users in this mode can ask any questions, but Copilot doesn't respond to certain questions related to inferring emotions, behavior, or judgments. When copilotLimitedMode=false, the current mode for Copilot, it responds to any types of questions grounded to the meeting conversation. The default value is `false`.|
|groupId|String|The ID of a Microsoft Entra group, of which the value of `isEnabledForGroup` is applied value for its members. The default value is `null`. This parameter is optional. If `isEnabledForGroup` is set to true, the `groupId` value must be provided for the copilotLimitedMode to be enabled for the members of the group.|

## Response

If successful, this method returns a `200 OK` response code and an updated [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object in the response body.

API can return additional HTTP status codes such as `403 Forbidden`, `500 Internal Server Error`, or `429 Too Many Requests`.

## Examples

### Request

The following example shows a request.
<!-- {
"blockType": "request",
"name": "update_copilotadminlimitedmode"
}
-->
``` http
PATCH https://graph.microsoft.com/beta/copilot/admin/settings/limitedMode
Content-Type: application/json
{
"@odata.type": "#microsoft.graph.copilotAdminLimitedMode",
"isEnabledForGroup": "Boolean",
"groupId": "String"
}
```


### Response

The following example shows the response.
>**Note:** The response object shown here might be shortened for readability.
<!-- {
"blockType": "response",
"truncated": true
}
-->
``` http
HTTP/1.1 200 OK
Content-Type: application/json
```

4 changes: 2 additions & 2 deletions api-reference/beta/api/filestorage-list-containers.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ GET /storage/fileStorage/containers?$filter=containerTypeId eq {containerTypeId}

## Query parameters

This method required the `containerTypeId` parameter. It supports the `$expand` OData query parameter except for on the for **drive**, **permissions**, and **customProperties** properties. For general information, see [OData query parameters](/graph/query-parameters).
This method required the `containerTypeId` parameter. It supports the `$expand` OData query parameter, except for the **drive**, **permissions**, and **customProperties** properties. For more information, see [OData query parameters](/graph/query-parameters).

## Request headers

Expand Down Expand Up @@ -68,7 +68,7 @@ The following example enumerates all containers of a given container type.
}
-->
``` http
GET https://graph.microsoft.com/beta/storage/fileStorage/containers?$filter=containerTypeId eq {containerTypeId}
GET https://graph.microsoft.com/beta/storage/fileStorage/containers?$filter=containerTypeId eq e2756c4d-fa33-4452-9c36-2325686e1082
```

# [C#](#tab/csharp)
Expand Down
2 changes: 2 additions & 0 deletions api-reference/beta/api/filestoragecontainer-activate.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "permissions", "name": "filestoragecontainer_activate" } -->
[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-activate-permissions.md)]

[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]

## HTTP request

<!-- {
Expand Down
4 changes: 3 additions & 1 deletion api-reference/beta/api/filestoragecontainer-delete-column.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ Choose the permission or permissions marked as least privileged for this API. Us

[!INCLUDE [permissions-table](../includes/permissions/filestoragecontainer-delete-columns-permissions.md)]

[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]

## HTTP request

<!-- {
"blockType": "ignored"
}
-->
``` http
DELETE /storageContainers/{containerId}/columns/{column-id}
DELETE /storageContainers/{containerId}/columns/{columnId}
```

## Request headers
Expand Down
Loading

0 comments on commit 350556b

Please sign in to comment.