Skip to content

Commit b3cdb81

Browse files
authored
Merge branch 'main' into surabhi-calla-windowsupdates-hotpatchupdate
2 parents 78d2729 + 115a913 commit b3cdb81

File tree

258 files changed

+3871
-2242
lines changed

Some content is hidden

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

258 files changed

+3871
-2242
lines changed

api-reference/beta/api/accesspackage-list-accesspackageresourcerolescopes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "List accessPackageResourceRoleScopes"
3-
description: "Retrieve a list of accesspackageresourcerolescope objects."
3+
description: "Retrieve an access package with a list of accessPackageResourceRoleScope objects."
44
ms.localizationpriority: medium
55
author: "markwahl-msft"
66
ms.subservice: "entra-id-governance"

api-reference/beta/api/accesspackagecatalog-list-accesspackageresourceroles.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "List accessPackageResourceRoles"
3-
description: "Retrieve a list of accessPackageResourceRole objects."
3+
description: "Retrieve a list of accessPackageResourceRole objects of an accessPackageResource in an accessPackageCatalog."
44
ms.localizationpriority: medium
55
author: "markwahl-msft"
66
ms.subservice: "entra-id-governance"
@@ -132,9 +132,9 @@ Content-type: application/json
132132
}
133133
```
134134

135-
### Example 2: Retrieve the roles of a resource for a SharePoint Online site
135+
### Example 2: Retrieve the roles of a resource for a SharePoint site
136136

137-
This is an example of retrieving the roles of a resource, to obtain the **originId** of each role. This would be used after a SharePoint Online site has been added as a resource to the catalog, as the **originId** of a SharePoint site role, the sequence number of the role in the site, is needed to add the role to an access package.
137+
The following example shows how to retrieve the roles of a resource, to obtain the **originId** of each role. This would be used after a SharePoint site has been added as a resource to the catalog, as the **originId** of a SharePoint site role, the sequence number of the role in the site, is needed to add the role to an access package.
138138

139139
#### Request
140140

@@ -188,7 +188,7 @@ GET https://graph.microsoft.com/beta/identityGovernance/entitlementManagement/ac
188188

189189
#### Response
190190

191-
The following example shows the response. The **displayName** is the same as shown in the SharePoint Online view of a site, and the **originId** is the underlying identifier established by SharePoint Online for the role.
191+
The following example shows the response. The **displayName** is the same as shown in the SharePoint view of a site, and the **originId** is the underlying identifier established by SharePoint for the role.
192192

193193
> **Note:** The response object shown here might be shortened for readability.
194194

api-reference/beta/api/accesspackagecatalog-list-accesspackageresources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "List accessPackageResources"
3-
description: "Retrieve a list of accesspackageresource objects."
3+
description: "Retrieve a list of accessPackageResource objects in an accessPackageCatalog."
44
ms.localizationpriority: medium
55
author: "markwahl-msft"
66
ms.subservice: "entra-id-governance"

api-reference/beta/api/authorizationpolicy-get.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
2525
<!-- { "blockType": "permissions", "name": "authorizationpolicy_get" } -->
2626
[!INCLUDE [permissions-table](../includes/permissions/authorizationpolicy-get-permissions.md)]
2727

28+
[!INCLUDE [rbac-authorization-policy-apis-read](../includes/rbac-for-apis/rbac-authorization-policy-apis-read.md)]
29+
2830
## HTTP request
2931

3032
<!-- { "blockType": "ignored" } -->

api-reference/beta/api/authorizationpolicy-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2525
<!-- { "blockType": "permissions", "name": "authorizationpolicy_update" } -->
2626
[!INCLUDE [permissions-table](../includes/permissions/authorizationpolicy-update-permissions.md)]
2727

28-
For delegated scenarios, the user needs to have the *Privileged Role Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).
28+
[!INCLUDE [rbac-authorization-policy-apis-update](../includes/rbac-for-apis/rbac-authorization-policy-apis-update.md)]
2929

3030
## HTTP request
3131

api-reference/beta/api/azureadauthentication-get.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
2222
<!-- { "blockType": "permissions", "name": "azureadauthentication_get" } -->
2323
[!INCLUDE [permissions-table](../includes/permissions/azureadauthentication-get-permissions.md)]
2424

25-
For delegated scenarios, the calling user needs to belong to at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):
26-
+ Global Reader
27-
+ Reports Reader
28-
+ Security Administrator
29-
+ Security Operator
30-
+ Security Reader
25+
[!INCLUDE [rbac-entra-health-service-activity-apis](../includes/rbac-for-apis/rbac-entra-health-service-activity-apis.md)]
3126

3227
## HTTP request
3328

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
---
2+
title: "Get certificateAuthorityDetail"
3+
description: "Read the properties and relationships of a certificateAuthorityDetail object."
4+
author: "suawat"
5+
ms.localizationpriority: medium
6+
ms.subservice: "entra-sign-in"
7+
doc_type: apiPageType
8+
---
9+
10+
# Get certificateAuthorityDetail
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Read the properties and relationships of a [certificateAuthorityDetail](../resources/certificateauthoritydetail.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+
<!-- { "blockType": "permissions", "name": "certificateauthoritydetail_get" } -->
23+
[!INCLUDE [permissions-table](../includes/permissions/certificateauthoritydetail-get-permissions.md)]
24+
25+
[!INCLUDE [rbac-cert-based-authpkis-apis](../includes/rbac-for-apis/rbac-cert-based-authpkis-apis.md)]
26+
27+
## HTTP request
28+
29+
<!-- {
30+
"blockType": "ignored"
31+
}
32+
-->
33+
34+
``` http
35+
GET /directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
36+
```
37+
38+
## Optional query parameters
39+
40+
This method supports the `$select` OData query parameter to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
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 [certificateAuthorityDetail](../resources/certificateauthoritydetail.md) object in the response body.
55+
56+
## Examples
57+
58+
### Request
59+
60+
The following example shows a request.
61+
<!-- {
62+
"blockType": "request",
63+
"name": "get_certificateauthoritydetail"
64+
}
65+
-->
66+
``` http
67+
GET https://graph.microsoft.com/beta/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
68+
```
69+
70+
71+
### Response
72+
73+
The following example shows the response.
74+
>**Note:** The response object shown here might be shortened for readability.
75+
<!-- {
76+
"blockType": "response",
77+
"truncated": true,
78+
"@odata.type": "microsoft.graph.certificateAuthorityDetail"
79+
}
80+
-->
81+
``` http
82+
HTTP/1.1 200 OK
83+
Content-Type: application/json
84+
85+
{
86+
"value": {
87+
"@odata.type": "#microsoft.graph.certificateAuthorityDetail",
88+
"id": "90777c92-2eb3-4a68-931d-4a3e1e1c741f",
89+
"deletedDateTime": null,
90+
"certificateAuthorityType": "root",
91+
"certificate": "Binary",
92+
"displayName": "Contoso2 CA1",
93+
"issuer": "Contoso2",
94+
"issuerSubjectKeyIdentifier": "C0E9....711A",
95+
"createdDateTime": "2024-10-25T18:05:28Z",
96+
"expirationDateTime": "2027-08-29T02:05:57Z",
97+
"thumbprint": "C6FA....4E9CF2",
98+
"certificateRevocationListUrl": null,
99+
"deltacertificateRevocationListUrl": null,
100+
"isIssuerHintEnabled": true
101+
}
102+
}
103+
```
Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
---
2+
title: "Update certificateAuthorityDetail"
3+
description: "Update the properties of a certificateAuthorityDetail object."
4+
author: "suawat"
5+
ms.localizationpriority: medium
6+
ms.subservice: "entra-sign-in"
7+
doc_type: apiPageType
8+
---
9+
10+
# Update certificateAuthorityDetail
11+
12+
Namespace: microsoft.graph
13+
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Update the properties of a [certificateAuthorityDetail](../resources/certificateauthoritydetail.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+
<!-- { "blockType": "permissions", "name": "certificateauthoritydetail_update" } -->
23+
[!INCLUDE [permissions-table](../includes/permissions/certificateauthoritydetail-update-permissions.md)]
24+
25+
[!INCLUDE [rbac-cert-based-authpkis-apis](../includes/rbac-for-apis/rbac-cert-based-authpkis-apis.md)]
26+
27+
28+
## HTTP request
29+
30+
<!-- {
31+
"blockType": "ignored"
32+
}
33+
-->
34+
``` http
35+
PATCH /directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
36+
```
37+
38+
## Request headers
39+
40+
|Name|Description|
41+
|:---|:---|
42+
|Authorization|Bearer {token}. Required. Learn more about [authentication and authorization](/graph/auth/auth-concepts).|
43+
|Content-Type|application/json. Required.|
44+
45+
## Request body
46+
47+
[!INCLUDE [table-intro](../../includes/update-property-table-intro.md)]
48+
49+
|Property|Type|Description|
50+
|:---|:---|:---|
51+
|certificateAuthorityType|certificateAuthorityType|The type of certificate authority. The possible values are: `root`, `intermediate`, `unknownFutureValue`. |
52+
|certificate|Binary|The type of certificate authority. Possible values are: `root`, `intermediate`.|
53+
|displayName|String|The name of the certificate authority. |
54+
|issuer|String|The issuer of the certificate authority. |
55+
|issuerSubjectKeyIdentifier|String|The subject key identifier of certificate authority. |
56+
|createdDateTime|DateTimeOffset|The date and time when the certificate authority was created. |
57+
|expirationDateTime|DateTimeOffset|The date and time when the certificate authority expires. Required.|
58+
|thumbprint|String|The thumbprint of certificate authority certificate. Required.|
59+
|certificateRevocationListUrl|String|The URL to check if the certificate is revoked. |
60+
|deltacertificateRevocationListUrl|String|The URL to check if the certificate is revoked. |
61+
|isIssuerHintEnabled|Boolean|Indicates whether the certificate picker presents the certificate authority to the user to use for authentication. Default value is `false`. |
62+
63+
64+
65+
## Response
66+
67+
If successful, this method returns a `200 OK` response code and an updated [certificateAuthorityDetail](../resources/certificateauthoritydetail.md) object in the response body.
68+
69+
## Examples
70+
71+
### Request
72+
73+
The following example shows a request.
74+
<!-- {
75+
"blockType": "request",
76+
"name": "update_certificateauthoritydetail"
77+
}
78+
-->
79+
``` http
80+
PATCH https://graph.microsoft.com/beta/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
81+
Content-Type: application/json
82+
83+
{
84+
85+
"isIssuerHintEnabled": true
86+
87+
}
88+
```
89+
90+
91+
### Response
92+
93+
The following example shows the response.
94+
>**Note:** The response object shown here might be shortened for readability.
95+
<!-- {
96+
"blockType": "response",
97+
"truncated": true,
98+
"@odata.type": "microsoft.graph.certificateAuthorityDetail"
99+
}
100+
-->
101+
``` http
102+
HTTP/1.1 200 OK
103+
Content-Type: application/json
104+
105+
{
106+
"@odata.type": "#microsoft.graph.certificateAuthorityDetail",
107+
"id": "90777c92-2eb3-4a68-931d-4a3e1e1c741f",
108+
"deletedDateTime": null,
109+
"certificateAuthorityType": "root",
110+
"certificate": "Binary",
111+
"displayName": "Contoso2 CA1",
112+
"issuer": "Contoso2",
113+
"issuerSubjectKeyIdentifier": "C0E9....711A",
114+
"createdDateTime": "2024-10-25T18:05:28Z",
115+
"expirationDateTime": "2027-08-29T02:05:57Z",
116+
"thumbprint": "C6FA....4E9CF2",
117+
"certificateRevocationListUrl": null,
118+
"deltacertificateRevocationListUrl": null,
119+
"isIssuerHintEnabled": true
120+
121+
}
122+
```
123+

api-reference/v1.0/api/filestorage-delete-deletedcontainers.md renamed to api-reference/beta/api/certificatebasedauthpki-delete-certificateauthorities.md

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
11
---
2-
title: "Remove deleted fileStorageContainer"
3-
description: "Remove a deleted fileStorageContainer object."
4-
author: "harmoneddie"
2+
title: "Delete certificateAuthorityDetail"
3+
description: "Delete a certificateAuthorityDetail object."
4+
author: "suawat"
55
ms.localizationpriority: medium
6-
ms.subservice: "onedrive"
6+
ms.subservice: "entra-sign-in"
77
doc_type: apiPageType
88
---
99

10-
# Remove deleted fileStorageContainer
10+
# Delete certificateAuthorityDetail
1111

1212
Namespace: microsoft.graph
1313

14-
Permanently remove a [fileStorageContainer](../resources/filestoragecontainer.md) from the deleted container collection. Removing a file storage container with this API permanently removes it from the deleted container collection. Therefore, it can't be restored later.
14+
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
15+
16+
Delete a [certificateAuthorityDetail](../resources/certificateauthoritydetail.md) object.
1517

1618
## Permissions
1719

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

20-
<!-- {
21-
"blockType": "permissions",
22-
"name": "filestorage-delete-deletedcontainers-permissions"
23-
}
24-
-->
25-
[!INCLUDE [permissions-table](../includes/permissions/filestorage-delete-deletedcontainers-permissions.md)]
22+
<!-- { "blockType": "permissions", "name": "certificatebasedauthpki_delete_certificateauthorities" } -->
23+
[!INCLUDE [permissions-table](../includes/permissions/certificatebasedauthpki-delete-certificateauthorities-permissions.md)]
2624

27-
[!INCLUDE [app-permissions](../includes/sharepoint-embedded-app-permissions.md)]
25+
[!INCLUDE [rbac-cert-based-authpkis-apis](../includes/rbac-for-apis/rbac-cert-based-authpkis-apis.md)]
2826

2927
## HTTP request
3028

@@ -33,7 +31,7 @@ Choose the permission or permissions marked as least privileged for this API. Us
3331
}
3432
-->
3533
``` http
36-
DELETE /storage/fileStorage/deletedContainers/{containerId}
34+
DELETE /directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
3735
```
3836

3937
## Request headers
@@ -55,24 +53,22 @@ If successful, this method returns a `204 No Content` response code.
5553
### Request
5654

5755
The following example shows a request.
58-
5956
<!-- {
6057
"blockType": "request",
61-
"name": "remove_deleted_filestoragecontainer"
58+
"name": "delete_certificateauthoritydetail"
6259
}
6360
-->
6461
``` http
65-
DELETE https://graph.microsoft.com/v1.0/storage/fileStorage/deletedContainers/b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z
62+
DELETE https://graph.microsoft.com/beta/directory/publicKeyInfrastructure/certificateBasedAuthConfigurations/{certificateBasedAuthPkiId}/certificateAuthorities/{certificateAuthorityDetailId}
6663
```
67-
---
64+
6865

6966
### Response
7067

7168
The following example shows the response.
72-
>**Note:** The response object shown here might be shortened for readability.
7369
<!-- {
7470
"blockType": "response",
75-
"truncated": true,
71+
"truncated": true
7672
}
7773
-->
7874
``` http

0 commit comments

Comments
 (0)