From 3ae7245ad22eca65eba54f6ca3a9b9ae117dcad2 Mon Sep 17 00:00:00 2001 From: Shilpi Kansal Date: Fri, 24 May 2024 11:38:27 -0700 Subject: [PATCH 1/5] Ad autoreconcileconflictingproxyaddresses property to restore API --- .../beta/api/directory-deleteditems-restore.md | 12 +++++++++++- changelog/Microsoft.DirectoryServices.json | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/api-reference/beta/api/directory-deleteditems-restore.md b/api-reference/beta/api/directory-deleteditems-restore.md index 9944f4f8af1..a3488c6bc4d 100644 --- a/api-reference/beta/api/directory-deleteditems-restore.md +++ b/api-reference/beta/api/directory-deleteditems-restore.md @@ -48,7 +48,13 @@ POST /directory/deleteditems/{id}/restore | Content-type | application/json | ## Request body -Don't supply a request body for this method. +In the request body, supply a JSON representation of the parameters. + +The following table lists the parameters that are required when you call this action. + +|Parameter|Type|Description| +|:---|:---|:---| +|autoReconcileProxyConflict|Boolean|Optional parameter. Indicates whether the conflicting proxy addresses should be auto-reconciled or not while restoring a soft-deleted user. Proxy conflict means that one or more of the proxy addresses of the soft-deleted user is also used for another active user. Used only for restoreing soft-deleted [user](../resources/user.md).| ## Response @@ -65,6 +71,10 @@ If successful, this method returns a `200 OK` response code and a [directoryObje }--> ```http POST https://graph.microsoft.com/beta/directory/deleteditems/46cc6179-19d0-473e-97ad-6ff84347bbbb/restore +Content-Type: application/json +{ + "autoReconcileProxyConflict": "true" +} ``` # [C#](#tab/csharp) diff --git a/changelog/Microsoft.DirectoryServices.json b/changelog/Microsoft.DirectoryServices.json index bb6eafee04c..c63498b10c9 100644 --- a/changelog/Microsoft.DirectoryServices.json +++ b/changelog/Microsoft.DirectoryServices.json @@ -13199,6 +13199,24 @@ "CreatedDateTime": "2024-05-28T20:33:58.6582248Z", "WorkloadArea": "Identity and access", "SubArea": "Directory management" + }, + { + "ChangeList": [ + { + "Id": "5c248ebb-bbb9-45dc-b6bc-3dc7b29229b8", + "ApiChange": "Parameter", + "ChangedApiName": "autoReconcileProxyConflict", + "ChangeType": "Addition", + "Description": "Added the `autoReconcileProxyConflict` parameter to the [restore directoryObject](https://learn.microsoft.com/en-us/graph/api/directory-deleteditems-restore?view=graph-rest-beta) method. Use this property to specify whether Microsoft Entra ID should autoreconcile conflicting proxy addresses while restoring a soft-deleted user whose one or more proxy addresses are currently used for an active user.", + "Target": "restore" + } + ], + "Id": "5c248ebb-bbb9-45dc-b6bc-3dc7b29229b8", + "Cloud": "Prod", + "Version": "beta", + "CreatedDateTime": "2024-05-24T05:48:06.5135016Z", + "WorkloadArea": "Identity and access", + "SubArea": "Directory management" } ] } From ab1011b336a4aa312423621f3436334497b5b670 Mon Sep 17 00:00:00 2001 From: Shilpi Kansal Date: Wed, 5 Jun 2024 09:30:05 -0700 Subject: [PATCH 2/5] Pr comments --- .../api/directory-deleteditems-restore.md | 48 +++++++++++++++++-- changelog/Microsoft.DirectoryServices.json | 3 +- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/api-reference/beta/api/directory-deleteditems-restore.md b/api-reference/beta/api/directory-deleteditems-restore.md index a3488c6bc4d..5a05a4f55e5 100644 --- a/api-reference/beta/api/directory-deleteditems-restore.md +++ b/api-reference/beta/api/directory-deleteditems-restore.md @@ -54,7 +54,7 @@ The following table lists the parameters that are required when you call this ac |Parameter|Type|Description| |:---|:---|:---| -|autoReconcileProxyConflict|Boolean|Optional parameter. Indicates whether the conflicting proxy addresses should be auto-reconciled or not while restoring a soft-deleted user. Proxy conflict means that one or more of the proxy addresses of the soft-deleted user is also used for another active user. Used only for restoreing soft-deleted [user](../resources/user.md).| +|autoReconcileProxyConflict|Boolean|Optional parameter. Indicates whether Microsoft Entra ID should remove any conflicting proxy addresses while restoring a soft-deleted user whose one or more proxy addresses are currently used for an active user. Used only for restoring soft-deleted [user](../resources/user.md). The default value for this paramater is `false`.| ## Response @@ -71,10 +71,6 @@ If successful, this method returns a `200 OK` response code and a [directoryObje }--> ```http POST https://graph.microsoft.com/beta/directory/deleteditems/46cc6179-19d0-473e-97ad-6ff84347bbbb/restore -Content-Type: application/json -{ - "autoReconcileProxyConflict": "true" -} ``` # [C#](#tab/csharp) @@ -150,4 +146,46 @@ Content-type: application/json } --> +### Request + + +```http +POST https://graph.microsoft.com/beta/directory/deleteditems/78bf875b-9343-4edc-9130-0d3958113563/restore +Content-Type: application/json + +{ + "autoReconcileProxyConflict": "true" +} +``` + +### Response +Note: The response object shown here might be shortened for readability. + +```http +HTTP/1.1 200 OK +Content-type: application/json + +{ + "@odata.context": "https://graph.microsoft.com/beta/$metadata#users/$entity", + "id": "78bf875b-9343-4edc-9130-0d3958113563", + "businessPhones": [], + "displayName": "SampleUser", + "givenName": "Sample", + "jobTitle": "Product Marketing Manager", + "mail": "sampleuser@contoso.com", + "mobilePhone": "+1 425 555 0109", + "officeLocation": "18/2111", + "preferredLanguage": "en-US", + "surname": "Vance", + "userPrincipalName": "sampleuser@contoso.com" +} +``` + diff --git a/changelog/Microsoft.DirectoryServices.json b/changelog/Microsoft.DirectoryServices.json index c63498b10c9..0b65314f982 100644 --- a/changelog/Microsoft.DirectoryServices.json +++ b/changelog/Microsoft.DirectoryServices.json @@ -13175,7 +13175,7 @@ "ChangeType": "Addition", "Description": "Added the **rootDomain** relationship to the [domain](https://learn.microsoft.com/en-us/graph/api/resources/domain?view=graph-rest-beta) resource.", "Target": "domain" - }, + }, { "Id": "2f9e7cf5-97c2-4e4b-aa4d-8c5da1598ef6", "ApiChange": "Method", @@ -13220,3 +13220,4 @@ } ] } + \ No newline at end of file From 5886896623d444130be12a0213330c85595b368a Mon Sep 17 00:00:00 2001 From: Faith Moraa Ombongi Date: Wed, 5 Jun 2024 20:16:24 +0300 Subject: [PATCH 3/5] Update directory-deleteditems-restore.md Boolean shouldn't be quoted --- api-reference/beta/api/directory-deleteditems-restore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-reference/beta/api/directory-deleteditems-restore.md b/api-reference/beta/api/directory-deleteditems-restore.md index 5a05a4f55e5..1fafa8efa51 100644 --- a/api-reference/beta/api/directory-deleteditems-restore.md +++ b/api-reference/beta/api/directory-deleteditems-restore.md @@ -157,7 +157,7 @@ POST https://graph.microsoft.com/beta/directory/deleteditems/78bf875b-9343-4edc- Content-Type: application/json { - "autoReconcileProxyConflict": "true" + "autoReconcileProxyConflict": true } ``` From fb10c3cc8e5c39dca1ddc00cb353f4a5b4bc05b7 Mon Sep 17 00:00:00 2001 From: Laura Graham Date: Fri, 7 Jun 2024 18:09:57 -0700 Subject: [PATCH 4/5] Formatting. --- api-reference/beta/api/directory-deleteditems-restore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-reference/beta/api/directory-deleteditems-restore.md b/api-reference/beta/api/directory-deleteditems-restore.md index 1fafa8efa51..6c6f22f3467 100644 --- a/api-reference/beta/api/directory-deleteditems-restore.md +++ b/api-reference/beta/api/directory-deleteditems-restore.md @@ -162,7 +162,7 @@ Content-Type: application/json ``` ### Response -Note: The response object shown here might be shortened for readability. +> **Note:** The response object shown here might be shortened for readability.