Skip to content

Commit 582e412

Browse files
authored
Merge branch 'main' into willfiddes-patch-1
2 parents a9d04ab + 090e645 commit 582e412

File tree

224 files changed

+4494
-584
lines changed

Some content is hidden

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

224 files changed

+4494
-584
lines changed

api-reference/beta/api/appmanagementpolicy-post.md

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ POST /policies/appManagementPolicies
4343

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

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

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

6970
- Enables the policy.
70-
- Blocks creating of new passwords for applications and service principals created on or after 2019-10-19 at 10:37 AM UTC time.
71-
- Enforces lifetime on password secrets and key credentials for applications created on or after 2014-10-19 at 10:37 AM UTC time.
72-
- 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.
71+
- Blocks creating of new passwords for applications and service principals created on or after October 19th 2019 at 10:37 AM UTC time.
72+
- Limits password secrets for apps and service principals created after October 19th 2014 at 10:37 AM UTC time to less than 90 days.
73+
- 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.
74+
- 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.
7375

7476

7577
# [HTTP](#tab/http)
@@ -89,45 +91,35 @@ POST https://graph.microsoft.com/beta/policies/appManagementPolicies
8991
"passwordCredentials": [
9092
{
9193
"restrictionType": "passwordAddition",
94+
"state": "enabled",
9295
"maxLifetime": null,
9396
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
9497
},
9598
{
9699
"restrictionType": "passwordLifetime",
100+
"state": "enabled",
97101
"maxLifetime": "P90D",
98102
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
99103
},
100104
{
101105
"restrictionType": "symmetricKeyAddition",
106+
"state": "enabled",
102107
"maxLifetime": null,
103108
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
104109
},
105110
{
106111
"restrictionType": "symmetricKeyLifetime",
107-
"maxLifetime": "P30D",
108-
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
109-
}
110-
],
111-
"keyCredentials": [
112-
{
113-
"restrictionType": "asymmetricKeyLifetime",
112+
"state": "enabled",
114113
"maxLifetime": "P90D",
115114
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
116-
},
117-
{
118-
"restrictionType": "trustedCertificateAuthority",
119-
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z",
120-
"certificateBasedApplicationConfigurationIds": [
121-
"eec5ba11-2fc0-4113-83a2-ed986ed13743",
122-
"bb8e164b-f9ed-4b98-bc45-65eddc14f4c1"
123-
],
124-
"maxLifetime": null
125115
}
126116
],
117+
"keyCredentials": [],
127118
"applicationRestrictions": {
128119
"identifierUris": {
129120
"nonDefaultUriAddition": {
130-
"restrictForAppsCreatedAfterDateTime": "2024-01-01T10:37:00Z",
121+
"state": "disabled",
122+
"restrictForAppsCreatedAfterDateTime": null,
131123
"excludeAppsReceivingV2Tokens": true,
132124
"excludeSaml": true
133125
}
@@ -186,6 +178,7 @@ The following example shows the response.
186178
HTTP/1.1 200 OK
187179
Content-type: application/json
188180
181+
189182
{
190183
"@odata.context": "https://graph.microsoft.com/beta/$metadata#policies/appManagementPolicies/$entity",
191184
"id": "a4ab1ed9-46bb-4bef-88d4-86fd6398dd5d",
@@ -196,15 +189,40 @@ Content-type: application/json
196189
"passwordCredentials": [
197190
{
198191
"restrictionType": "passwordAddition",
192+
"state": "enabled",
199193
"maxLifetime": null,
200194
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
201195
},
202196
{
203197
"restrictionType": "passwordLifetime",
198+
"state": "enabled",
204199
"maxLifetime": "P90D",
205200
"restrictForAppsCreatedAfterDateTime": "2018-10-19T10:37:00Z"
201+
},
202+
{
203+
"restrictionType": "symmetricKeyAddition",
204+
"state": "enabled",
205+
"maxLifetime": null,
206+
"restrictForAppsCreatedAfterDateTime": "2019-10-19T10:37:00Z"
207+
},
208+
{
209+
"restrictionType": "symmetricKeyLifetime",
210+
"state": "enabled",
211+
"maxLifetime": "P90D",
212+
"restrictForAppsCreatedAfterDateTime": "2014-10-19T10:37:00Z"
206213
}
207-
]
214+
],
215+
"keyCredentials": [],
216+
"applicationRestrictions": {
217+
"identifierUris": {
218+
"nonDefaultUriAddition": {
219+
"state": "disabled",
220+
"restrictForAppsCreatedAfterDateTime": null,
221+
"excludeAppsReceivingV2Tokens": true,
222+
"excludeSaml": true
223+
}
224+
}
225+
}
208226
}
209227
}
210228
```

api-reference/beta/api/cloudpcprovisioningpolicy-apply.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ The following table shows the parameter that you can use with this method.
5050

5151
|Parameter|Type|Description|
5252
|:---|:---|:---|
53-
|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`.|
53+
|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`.|
54+
|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.|
5455

5556
## Response
5657

@@ -74,7 +75,8 @@ POST https://graph.microsoft.com/beta/deviceManagement/virtualEndpoint/provision
7475
Content-Type: application/json
7576
7677
{
77-
"policySettings": "region"
78+
"policySettings": "region",
79+
"reservePercentage": 80,
7880
}
7981
```
8082

api-reference/beta/api/cloudpcreports-retrievebulkactionstatusreport.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,30 @@ Content-Type: application/octet-stream
9898
}
9999
```
100100

101+
# [C#](#tab/csharp)
102+
[!INCLUDE [sample-code](../includes/snippets/csharp/cloudpcreportsretrievebulkactionstatusreport-csharp-snippets.md)]
103+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
104+
105+
# [CLI](#tab/cli)
106+
[!INCLUDE [sample-code](../includes/snippets/cli/cloudpcreportsretrievebulkactionstatusreport-cli-snippets.md)]
107+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
108+
109+
# [Go](#tab/go)
110+
[!INCLUDE [sample-code](../includes/snippets/go/cloudpcreportsretrievebulkactionstatusreport-go-snippets.md)]
111+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
112+
113+
# [Java](#tab/java)
114+
[!INCLUDE [sample-code](../includes/snippets/java/cloudpcreportsretrievebulkactionstatusreport-java-snippets.md)]
115+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
116+
101117
# [JavaScript](#tab/javascript)
102118
[!INCLUDE [sample-code](../includes/snippets/javascript/cloudpcreportsretrievebulkactionstatusreport-javascript-snippets.md)]
103119
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
104120

121+
# [Python](#tab/python)
122+
[!INCLUDE [sample-code](../includes/snippets/python/cloudpcreportsretrievebulkactionstatusreport-python-snippets.md)]
123+
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
124+
105125
---
106126

107127
### Response
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
---
2+
title: "Get copilotAdminLimitedMode"
3+
description: "Read the properties and relationships of a copilotAdminLimitedMode object."
4+
author: "gautamjain14"
5+
ms.localizationpriority: medium
6+
ms.subservice: "meetings-copilot"
7+
doc_type: apiPageType
8+
---
9+
10+
# Get copilotAdminLimitedMode
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Read the properties and relationships of a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object.
17+
18+
## Permissions
19+
20+
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).
21+
22+
<!-- {
23+
"blockType": "permissions",
24+
"name": "copilotadminlimitedmode-get-permissions"
25+
}
26+
-->
27+
> **Note:** Global admin or Global reader permission is required to call this API.
28+
29+
<!-- { "blockType": "permissions", "name": "copilotadminlimitedmode_get" } -->
30+
[!INCLUDE [permissions-table](../includes/permissions/copilotadminlimitedmode-get-permissions.md)]
31+
32+
33+
## HTTP request
34+
35+
<!-- {
36+
"blockType": "ignored"
37+
}
38+
-->
39+
``` http
40+
GET /copilot/admin/settings/limitedMode
41+
```
42+
## Request headers
43+
44+
|Name|Description|
45+
|:---|:---|
46+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
47+
48+
## Request body
49+
50+
Don't supply a request body for this method.
51+
52+
## Response
53+
54+
If successful, this method returns a `200 OK` response code and a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object in the response body.
55+
56+
The API can return more HTTP status codes: `403 Forbidden`, `500 Internal Server Error`, or `429 Too Many Requests`.
57+
58+
## Examples
59+
60+
### Request
61+
62+
The following example shows a request.
63+
<!-- {
64+
"blockType": "request",
65+
"name": "get_copilotadminlimitedmode"
66+
}
67+
-->
68+
``` http
69+
GET https://graph.microsoft.com/beta/copilot/admin/settings/limitedMode
70+
```
71+
72+
73+
### Response
74+
75+
The following example shows the response.
76+
>**Note:** The response object shown here might be shortened for readability.
77+
<!-- {
78+
"blockType": "response",
79+
"truncated": true,
80+
"@odata.type": "microsoft.graph.copilotAdminLimitedMode"
81+
}
82+
-->
83+
``` http
84+
HTTP/1.1 200 OK
85+
Content-Type: application/json
86+
87+
{
88+
"value": {
89+
"@odata.type": "#microsoft.graph.copilotAdminLimitedMode",
90+
"isEnabledForGroup": "Boolean",
91+
"groupId": "String"
92+
}
93+
}
94+
```
95+
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
---
2+
title: "Update copilotAminLimitedMode"
3+
description: "Update the properties of a copilotAdminLimitedMode object."
4+
author: "gautamjain14"
5+
ms.localizationpriority: medium
6+
ms.subservice: "meetings-copilot"
7+
doc_type: apiPageType
8+
---
9+
10+
# Update copilotAdminLimitedMode
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Update the properties of a [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object.
17+
18+
## Permissions
19+
20+
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).
21+
22+
<!-- {
23+
"blockType": "permissions",
24+
"name": "copilotadminlimitedmode-update-permissions"
25+
}
26+
-->
27+
> **Note:** Global admin or Global reader permission is required to call this API.
28+
29+
<!-- { "blockType": "permissions", "name": "copilotadminlimitedmode_update" } -->
30+
[!INCLUDE [permissions-table](../includes/permissions/copilotadminlimitedmode-update-permissions.md)]
31+
32+
## HTTP request
33+
34+
<!-- {
35+
"blockType": "ignored"
36+
}
37+
-->
38+
``` http
39+
PATCH /copilot/admin/settings/limitedMode
40+
```
41+
42+
## Request headers
43+
44+
|Name|Description|
45+
|:---|:---|
46+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
47+
|Content-Type|application/json. Required.|
48+
49+
## Request body
50+
51+
|Property|Type|Description|
52+
|:---|:---|:---|
53+
|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`.|
54+
|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.|
55+
56+
## Response
57+
58+
If successful, this method returns a `200 OK` response code and an updated [copilotAdminLimitedMode](../resources/copilotadminlimitedmode.md) object in the response body.
59+
60+
API can return additional HTTP status codes such as `403 Forbidden`, `500 Internal Server Error`, or `429 Too Many Requests`.
61+
62+
## Examples
63+
64+
### Request
65+
66+
The following example shows a request.
67+
<!-- {
68+
"blockType": "request",
69+
"name": "update_copilotadminlimitedmode"
70+
}
71+
-->
72+
``` http
73+
PATCH https://graph.microsoft.com/beta/copilot/admin/settings/limitedMode
74+
Content-Type: application/json
75+
76+
{
77+
"@odata.type": "#microsoft.graph.copilotAdminLimitedMode",
78+
"isEnabledForGroup": "Boolean",
79+
"groupId": "String"
80+
}
81+
```
82+
83+
84+
### Response
85+
86+
The following example shows the response.
87+
>**Note:** The response object shown here might be shortened for readability.
88+
<!-- {
89+
"blockType": "response",
90+
"truncated": true
91+
}
92+
-->
93+
``` http
94+
HTTP/1.1 200 OK
95+
Content-Type: application/json
96+
```
97+

0 commit comments

Comments
 (0)