Merge pull request #30873 from basma-msft/patch-1

Fixed webhook response

Author: Jak-MS

articles/marketplace/cloud-partner-portal/saas-app/cpp-saas-fulfillment-api-v2.md

@@ -114,7 +114,7 @@ Resolves the opaque token to a SaaS subscription.<br>
 ```json
 Response body:
 {
-    "subscriptionId": "<guid>",  
+    "id": "<guid>",  
     "subscriptionName": "Contoso Cloud Solution",
     "offerId": "offer1",
     "planId": "silver",
@@ -365,8 +365,7 @@ Internal Server Error<br>
 
 ```json
 {
-    "planId": "gold",
-    "quantity": ""
+    "planId": "gold"
 }
 ```
 
@@ -450,6 +449,9 @@ Bad request- Validation failures.
 Code: 403<br>
 Unauthorized. The auth token wasn't provided, is invalid, or the request is attempting to access an acquisition that doesn’t belong to the current publisher.
 
+Code: 409<br>
+Another operation is in progress on the resource. Wait for pending operations to complete then try again.
+
 Code: 500<br>
 Internal Server Error
 
@@ -516,6 +518,9 @@ Bad request- Validation failures.
 Code: 403<br>
 Unauthorized. The auth token wasn't provided, is invalid, or the request is attempting to access an acquisition that doesn’t belong to the current publisher.
 
+Code: 409<br>
+Another operation is in progress on the resource. Wait for pending operations to complete then try again.
+
 Code: 500<br>
 Internal Server Error
 
@@ -545,7 +550,6 @@ Unsubscribe and delete the specified subscription.
 
 |                    |                   |
 |  ---------------   |  ---------------  |
-|   Content-Type     |  `application/json` |
 |  x-ms-requestid    |   A unique string value for tracking the request from the client, preferably a GUID. If this value isn't provided, one will be generated and provided in the response headers.   |
 |  x-ms-correlationid  |  A unique string value for operation on the client. This parameter correlates all events from client operation with events on the server side. If this value isn't provided, one will be generated and provided in the response headers.   |
 |  authorization     |  [Get JSON web token (JWT) bearer token.](https://docs.microsoft.com/azure/marketplace/cloud-partner-portal/saas-app/cpp-saas-registration#get-a-token-based-on-the-azure-ad-app)  |
@@ -780,15 +784,16 @@ The publisher must implement a webhook in this SaaS service to proactively notif
 
 ```json
 {
-    "operationId": "<guid>",
-    "activityId": "<guid>",
-    "subscriptionId":"<guid>",
-    "offerId": "offer1",
-    "publisherId": "contoso",
-    "planId": "silver",
-    "quantity": "20"  ,
-    "action": "Subscribe",
-    "timeStamp": "2018-12-01T00:00:00"
+  "id": "<this is a Guid operation id, you can call operations API with this to get status>",
+  "activityId": "<this is a Guid correlation id>",
+  "subscriptionId": "<Guid to uniquely identify this resource>",
+  "publisherId": "<this is the publisher’s name>",
+  "offerId": "<this is the offer name>",
+  "planId": "<this is the plan id>",
+  "quantity": "<the number of seats, will be null if not per-seat saas offer>",
+  "timeStamp": "2019-04-15T20:17:31.7350641Z",
+  "action": "Unsubscribe",
+  "status": "NotStarted"  
 }
 
 Where action can be one of these: 
@@ -798,6 +803,14 @@ Where action can be one of these:
        ChangeQuantity, (When the change quantity operation has completed),
        Suspend, (When resource has been suspended)
        Reinstate, (When resource has been reinstated after suspension)
+
+
+Where status can be one of these:
+        NotStarted,
+        InProgress,
+        Succeeded,
+        Failed,
+        Conflict
 ```