Merge pull request #24407 from microsoftgraph/AddAutoReconcileConflic…

…tingProxyAddressProperty Ad autoreconcileconflictingproxyaddresses property to restore API
microsoftgraph · Jun 8, 2024 · 060f20b · 060f20b
2 parents 86c8684 + 7821708
commit 060f20b
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 2 deletions.
diff --git 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 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
 
@@ -140,4 +146,46 @@ Content-type: application/json
 }
 -->
 
+### Request
+
+<!-- {
+  "blockType": "request",
+  "name": "restore_directory_deleteditem_autoreconcileproxyconflict"
+}-->
+```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.
+<!-- {
+  "blockType": "response",
+  "truncated": true,
+  "@odata.type": "microsoft.graph.directoryObject"
+} -->
+```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
@@ -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",
@@ -13199,6 +13199,25 @@
       "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-06-07T05:48:06.5135016Z",
+      "WorkloadArea": "Identity and access",
+      "SubArea": "Directory management"
     }
   ]
 }
+