Skip to content

Commit da91374

Browse files
authored
Merge branch 'main' into u/fondieki/NamePronunciationAddSnippets
2 parents 4ccc979 + 73b8146 commit da91374

File tree

84 files changed

+704
-223
lines changed

Some content is hidden

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

84 files changed

+704
-223
lines changed

api-reference/beta/api/administrativeunit-delta.md

Lines changed: 3 additions & 1 deletion
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": "administrativeunit_delta" } -->
2626
[!INCLUDE [permissions-table](../includes/permissions/administrativeunit-delta-permissions.md)]
2727

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

3032
To begin tracking changes, you make a request that includes the delta function on the **administrativeUnit** resource.
@@ -44,7 +46,7 @@ You only need to specify any query parameters once up front.
4446
In subsequent requests, copy and apply the `@odata.nextLink` or `@odata.deltaLink` URL from the previous response. That URL already
4547
includes the encoded parameters.
4648

47-
| Query parameter | Type |Description|
49+
| Query parameter | Type |Description|
4850
|:---------------|:--------|:----------|
4951
| $deltatoken | string | A [state token](/graph/delta-query-overview) returned in the `@odata.deltaLink` URL of the previous **delta** function call for the same resource collection, indicating the completion of that round of change tracking. Save and apply the entire `@odata.deltaLink` URL including this token in the first request of the next round of change tracking for that collection.|
5052
| $skiptoken | string | A [state token](/graph/delta-query-overview) returned in the `@odata.nextLink` URL of the previous **delta** function call, indicating there are further changes to be tracked in the same resource collection. |

api-reference/beta/api/administrativeunit-get-members.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830

2931
```http

api-reference/beta/api/administrativeunit-get-scopedrolemembers.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830
<!-- { "blockType": "ignored" } -->
2931
```http

api-reference/beta/api/administrativeunit-list-scopedrolemembers.md

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

27+
[!INCLUDE [rbac-admin-units-apis-read](../includes/rbac-for-apis/rbac-admin-units-apis-read.md)]
28+
2729
## HTTP request
2830
<!-- { "blockType": "ignored" } -->
2931
```http

api-reference/beta/api/administrativeunit-post-members.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ One of the following permissions is required to call this API. To learn more, in
3030
|Delegated (personal Microsoft account) | Not supported. |
3131
|Application | AdministrativeUnit.ReadWrite.All |
3232

33-
To add a user, group, or device to an administrative unit, the calling user must be assigned the *Privileged Role Administrator* [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).
33+
[!INCLUDE [rbac-admin-units-apis-write](../includes/rbac-for-apis/rbac-admin-units-apis-write.md)]
3434

3535
### Permissions to create a new group
3636
<!-- { "blockType": "ignored" } // Note: Removing this line will result in the permissions autogeneration tool overwriting the table. -->
@@ -40,12 +40,12 @@ To add a user, group, or device to an administrative unit, the calling user must
4040
|Delegated (personal Microsoft account) | Not supported. |
4141
|Application | Group.Create and AdministrativeUnit.Read.All, Group.ReadWrite.All and AdministrativeUnit.Read.All, Directory.ReadWrite.All |
4242

43-
To create a new group in an administrative unit, the calling principal must be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) at the scope of the administrative unit:
44-
45-
* Groups Administrator
46-
* User Administrator
47-
48-
When these roles are assigned to a service principal, additional permissions are required to read the directory, such as assignment to the Directory Readers role, or having Microsoft Graph application permissions, such as Directory.Read.All.
43+
> [!IMPORTANT]
44+
> To create a new group in an administrative unit, the calling principal must be assigned at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) at the scope of the administrative unit:
45+
> - Groups Administrator
46+
> - User Administrator
47+
>
48+
> For app-only scenarios - apart from these roles, the service principal requires additional permissions to read the directory. These permissions can be granted via assignment of supported Microsoft Entra roles, such the Directory Readers role; or they can be granted via Microsoft Graph application permissions that allow reading the directory, such as *Directory.Read.All*.
4949
5050
## HTTP request
5151

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

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

27-
In delegated scenarios, the signed-in user must also be assigned a supported [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) or a custom role with the `microsoft.directory/administrativeUnits/allProperties/allTasks` role permission. *Privileged Role Administrator* is the least privileged role for this operation.
27+
[!INCLUDE [rbac-admin-units-apis-write](../includes/rbac-for-apis/rbac-admin-units-apis-write.md)]
2828

2929
## HTTP request
3030
<!-- { "blockType": "ignored" } -->

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

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

27-
The signed-in user must also be assigned one of the following [directory roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json):
28-
29-
+ Attribute Definition Reader
30-
+ Attribute Definition Administrator
31-
32-
By default, Global Administrator and other administrator roles do not have permissions to read, define, or assign custom security attributes.
27+
> [!IMPORTANT]
28+
> In delegated scenarios with work or school accounts, the signed-in user must be assigned a supported [Microsoft Entra role](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json) or a custom role with a supported role permission. The following privileged roles are supported for this operation.
29+
> - Attribute Definition Reader
30+
> - Attribute Definition Administrator
31+
>
32+
> - By default, Global Administrator and other administrator roles do not have permissions to read, define, or assign custom security attributes.
3333
3434
## HTTP request
3535

api-reference/beta/api/applicationtemplate-instantiate.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ Namespace: microsoft.graph
1515

1616
Add an instance of an application from the [Microsoft Entra application gallery](../resources/applicationtemplate.md) into your directory.
1717

18-
The application template with ID `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` can be used to add a [non-gallery app](/azure/active-directory/manage-apps/add-non-gallery-app) that you can configure different single-sign on (SSO) modes like SAML SSO and password-based SSO.
18+
For [non-gallery apps](/entra/identity/enterprise-apps/add-application-portal), use an application template with one of the following IDs to configure different single sign-on (SSO) modes like SAML SSO and password-based SSO.
19+
20+
- Global service: `8adf8e6e-67b2-4cf2-a259-e3dc5476c621`
21+
- US government: `4602d0b4-76bb-404b-bca9-2652e1a39c6d`
22+
- China operated by 21Vianet: `5a532e38-1581-4918-9658-008dc27c1d68`
1923

2024
[!INCLUDE [national-cloud-support](../../includes/all-clouds.md)]
2125

@@ -34,8 +38,6 @@ Choose the permission or permissions marked as least privileged for this API. Us
3438
POST /applicationTemplates/{applicationTemplate-id}/instantiate
3539
```
3640

37-
To instantiate non-gallery apps, use the `8adf8e6e-67b2-4cf2-a259-e3dc5476c621` for the `{applicationTemplate-id}`.
38-
3941
## Request headers
4042

4143
| Name | Description |

api-reference/beta/api/bitlocker-list-recoverykeys.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ Choose the permission or permissions marked as least privileged for this API. Us
2424
<!-- { "blockType": "permissions", "name": "bitlocker_list_recoverykeys" } -->
2525
[!INCLUDE [permissions-table](../includes/permissions/bitlocker-list-recoverykeys-permissions.md)]
2626

27-
For delegated permissions to allow apps to get **bitLockerRecoveryKey** resources on behalf of the signed-in user, the user must be the registered owner of the device that the BitLocker recovery key was originally backed up from, or the calling user must be in at least one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).
28-
29-
* Cloud Device Administrator
30-
* Helpdesk Administrator
31-
* Intune Service Administrator
32-
* Security Administrator
33-
* Security Reader
34-
* Global Reader
27+
> [!IMPORTANT]
28+
> For delegated permissions, the calling user must be the registered owner of the device that the BitLocker recovery key was originally backed up from, or they must be assigned a supported [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).The following least privileged roles are supported for this operation.
29+
>
30+
> - Cloud device administrator
31+
> - Helpdesk administrator
32+
> - Intune service administrator
33+
> - Security administrator
34+
> - Security reader
35+
> - Global reader
3536
3637
## HTTP request
3738
To get a list of BitLocker keys within the tenant:

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ Choose the permission or permissions marked as least privileged for this API. Us
2424
<!-- { "blockType": "permissions", "name": "bitlockerrecoverykey_get" } -->
2525
[!INCLUDE [permissions-table](../includes/permissions/bitlockerrecoverykey-get-permissions.md)]
2626

27-
>**Note:** For delegated permissions to allow apps to get **bitLockerRecoveryKey** resources on behalf of the signed-in user, the tenant administrator must have assigned the user one of the following [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json), or the user must be the **registered owner** of the device that the BitLocker key was originally backed up from:
28-
29-
* Cloud Device Administrator
30-
* Helpdesk Administrator
31-
* Intune Service Administrator
32-
* Security Administrator
33-
* Security Reader
34-
* Global Reader
27+
> [!IMPORTANT]
28+
> For delegated permissions, the calling user must be the registered owner of the device that the BitLocker recovery key was originally backed up from, or they must be assigned a supported [Microsoft Entra roles](/entra/identity/role-based-access-control/permissions-reference?toc=%2Fgraph%2Ftoc.json).The following least privileged roles are supported for this operation.
29+
>
30+
> - Cloud device administrator
31+
> - Helpdesk administrator
32+
> - Intune service administrator
33+
> - Security administrator
34+
> - Security reader
35+
> - Global reader
3536
3637
## HTTP request
3738
To get the specified BitLocker key without returning the **key** property:

0 commit comments

Comments
 (0)