Skip to content

Commit

Permalink
Merge pull request #23795 from microsoftgraph/main
Browse files Browse the repository at this point in the history
Merge to publish.
  • Loading branch information
Lauragra authored Mar 5, 2024
2 parents 1a632bc + 96f0763 commit 4f94477
Show file tree
Hide file tree
Showing 59 changed files with 757 additions and 453 deletions.
6 changes: 0 additions & 6 deletions .openpublishing.publish.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "azure_docs",
"url": "https://github.com/MicrosoftDocs/azure-docs/",
"branch": "main",
"branch_mapping": {}
},
{
"path_to_root": "entra_docs",
"url": "https://github.com/MicrosoftDocs/entra-docs/",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Namespace: microsoft.graph

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

Get a list of the [delegatedAdminServiceManagementDetail](../resources/delegatedAdminServiceManagementDetail.md) objects and their properties.
Get a list of the [delegatedAdminServiceManagementDetail](../resources/delegatedadminservicemanagementdetail.md) objects and their properties.

[!INCLUDE [national-cloud-support](../../includes/global-only.md)]

Expand All @@ -33,7 +33,7 @@ GET /tenantRelationships/delegatedAdminCustomers/{delegatedAdminCustomerId}/serv
```

## Optional query parameters
This method does not support OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).
This method doesn't support OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).

## Request headers
|Name|Description|
Expand All @@ -45,12 +45,14 @@ Don't supply a request body for this method.

## Response

If successful, this method returns a `200 OK` response code and a collection of [delegatedAdminServiceManagementDetail](../resources/delegatedAdminServiceManagementDetail.md) objects in the response body.
If successful, this method returns a `200 OK` response code and a collection of [delegatedAdminServiceManagementDetail](../resources/delegatedadminservicemanagementdetail.md) objects in the response body.

## Examples

### Request

The following example shows a request.

# [HTTP](#tab/http)
<!-- {
"blockType": "request",
Expand Down Expand Up @@ -96,6 +98,9 @@ GET https://graph.microsoft.com/beta/tenantRelationships/delegatedAdminCustomers
---

### Response

The following example shows the response.

>**Note:** The response object shown here might be shortened for readability.
<!-- {
"blockType": "response",
Expand Down
12 changes: 6 additions & 6 deletions api-reference/beta/api/educationmodule-unpin.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Namespace: microsoft.graph

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

Unpin an [educationModule](../resources/educationmodule.md) in the classwork list. This action sets the **isPinned** property to **false** for an [educationModule](../resources/educationmodule.md).
Unpin an [educationModule](../resources/educationmodule.md) in the classwork list. This action sets the **isPinned** property to `false` for an [educationModule](../resources/educationmodule.md).

Only teachers in the class can perform this operation.

Expand All @@ -29,8 +29,8 @@ Choose the permission or permissions marked as least privileged for this API. Us
<!-- { "blockType": "ignored" } -->
```http
POST /education/classes/{id}/modules/{id}/unpin
```

## Request headers
| Header | Value |
|:---------------|:--------|
Expand All @@ -40,13 +40,13 @@ POST /education/classes/{id}/modules/{id}/unpin
Don't supply a request body for this method.

## Response
If successful, this method returns a `200 Ok` response code and an [educationModule](../resources/educationmodule.md) object in the response body.
If successful, this method returns a `200 OK` response code and an [educationModule](../resources/educationmodule.md) object in the response body.

## Example
The following example shows how to call this API.

### Request
The following is an example of a request.
The following example shows a request.

# [HTTP](#tab/http)
<!-- {
Expand Down Expand Up @@ -94,7 +94,7 @@ POST https://graph.microsoft.com/beta/education/classes/37d99af7-cfc5-4e3b-8566-
---

### Response
The following is an example of a response.
The following example shows the response.

<!-- {
"blockType": "response",
Expand All @@ -103,7 +103,7 @@ The following is an example of a response.
} -->

```http
HTTP/1.1 200 Ok
HTTP/1.1 200 OK
{
"@odata.context": "https://graph.microsoft.com/$metadata#educationModule",
Expand Down
90 changes: 90 additions & 0 deletions api-reference/beta/api/federatedtokenvalidationpolicy-get.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
---
title: "Get federatedTokenValidationPolicy"
description: "Read the properties and relationships of a federatedTokenValidationPolicy object."
author: "rahul-nagraj"
ms.localizationpriority: medium
ms.prod: "identity-and-sign-in"
doc_type: apiPageType
---

# Get federatedTokenValidationPolicy
Namespace: microsoft.graph

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

Read the properties and relationships of a [federatedTokenValidationPolicy](../resources/federatedtokenvalidationpolicy.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": "federatedtokenvalidationpolicy-get-permissions"
}
-->
[!INCLUDE [permissions-table](../includes/permissions/federatedtokenvalidationpolicy-get-permissions.md)]

## HTTP request

<!-- {
"blockType": "ignored"
}
-->
``` http
GET /policies/federatedTokenValidationPolicy
```

## Optional query parameters
This method does not support OData query parameters to help customize the response. For general information, see [OData query parameters](/graph/query-parameters).

## 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 [federatedTokenValidationPolicy](../resources/federatedtokenvalidationpolicy.md) object in the response body.

## Examples

### Request
The following example shows a request.
<!-- {
"blockType": "request",
"name": "get_federatedtokenvalidationpolicy"
}
-->
``` http
GET https://graph.microsoft.com/beta/policies/federatedTokenValidationPolicy
```

### 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.federatedTokenValidationPolicy"
}
-->
``` http
HTTP/1.1 200 OK
Content-Type: application/json
{
"value": {
"@odata.type": "#microsoft.graph.federatedTokenValidationPolicy",
"id": "932b8f7f-68c1-6fe5-59ab-56e1ff752f30",
"deletedDateTime": "2023-08-25T07:44:46.2616778Z",
"validatingDomains": {
"@odata.type": "microsoft.graph.validatingDomains",
"rootDomains": "enumerated",
"domainNames": ["contoso.com","fabrikam.com"]
}
}
}
```
102 changes: 102 additions & 0 deletions api-reference/beta/api/federatedtokenvalidationpolicy-update.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
---
title: "Update federatedTokenValidationPolicy"
description: "Update the properties of a federatedTokenValidationPolicy object."
author: "rahul-nagraj"
ms.localizationpriority: medium
ms.prod: "identity-and-sign-in"
doc_type: apiPageType
---

# Update federatedTokenValidationPolicy
Namespace: microsoft.graph

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

Update the properties of a [federatedTokenValidationPolicy](../resources/federatedtokenvalidationpolicy.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": "federatedtokenvalidationpolicy-update-permissions"
}
-->
[!INCLUDE [permissions-table](../includes/permissions/federatedtokenvalidationpolicy-update-permissions.md)]

## HTTP request

<!-- {
"blockType": "ignored"
}
-->
``` http
PUT /policies/federatedTokenValidationPolicy
```

## 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
[!INCLUDE [table-intro](../../includes/update-property-table-intro.md)]

|Property|Type|Description|
|:---|:---|:---|
|validatingDomains|[validatingDomains](../resources/validatingdomains.md)|Verified domains that Microsoft Entra validates whether the federated account's root domain matches with the mapped Microsoft Entra account's root domain. Required.|



## Response

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

## Examples

### Request
The following example shows a request.
<!-- {
"blockType": "request",
"name": "update_federatedtokenvalidationpolicy"
}
-->
``` http
PUT https://graph.microsoft.com/beta/policies/federatedTokenValidationPolicy
Content-Type: application/json
{
"@odata.type": "#microsoft.graph.federatedTokenValidationPolicy",
"deletedDateTime": "String (timestamp)",
"validatingDomains": {
"@odata.type": "microsoft.graph.validatingDomains",
"rootDomains": "enumerated",
"domainNames": ["contoso.com","fabrikam.com"]
}
}
```

### 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.federatedTokenValidationPolicy"
}
-->
``` http
HTTP/1.1 200 OK
Content-Type: application/json
{
"@odata.type": "#microsoft.graph.federatedTokenValidationPolicy",
"id": "932b8f7f-68c1-6fe5-59ab-56e1ff752f30",
"deletedDateTime": "2023-08-25T07:44:46.2616778Z",
"validatingDomains": {
"@odata.type": "microsoft.graph.validatingDomains"
}
}
```

Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ If successful, this method returns a `200 OK` response code and a collection of

The following example shows a request.

# [HTTP](#tab/http)
<!-- {
"blockType": "request",
"name": "list_profilecardproperties"
Expand All @@ -69,40 +68,6 @@ The following example shows a request.
GET https://graph.microsoft.com/beta/admin/people/profileCardProperties
```

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

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

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

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

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

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

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

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

---

### Response

The following example shows the response.
Expand All @@ -127,7 +92,7 @@ Content-type: application/json
"displayName": "Cost Center",
"localizations": [
{
"languageTag": "ru-RU",
"languageTag": "ru",
"displayName": "центр затрат"
}
]
Expand Down
Loading

0 comments on commit 4f94477

Please sign in to comment.