Merge branch 'master' of https://lpgithub.dev.lprnd.net/product-marke…

…ting/developers-community
zhaowenzhi-lp · Apr 28, 2019 · 81aef81 · 81aef81
2 parents f2ee0ce + 4bc95d9
commit 81aef81
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 31 deletions.
diff --git a/pages/documents/GettingStarted/retrieve_API_Domains.md b/pages/documents/GettingStarted/retrieve_API_Domains.md
@@ -44,6 +44,19 @@ JSON Example:
             "account": "EXAMPLE123",
             "baseURI": "lo.le1.liveperson.net"
         },
+<<<<<<< HEAD
+        {
+            "service": "visitorFeed",
+            "account": "EXAMPLE123",
+            "baseURI": "lo.v-feed.liveperson.net"
+        },
+        {
+            "service": "etool",
+            "account": "EXAMPLE123",
+            "baseURI": "z2.etool.liveperson.net"
+        },
+=======
+>>>>>>> 36de08a5835289aeae6e1fb45fdafb8d1a729fd8
 ```
 
 

diff --git a/pages/documents/MessagingChannels/PushNotificationService/tls.md b/pages/documents/MessagingChannels/PushNotificationService/tls.md
@@ -19,7 +19,7 @@ Customers supply a valid client key and certificate for a TLS connection (one-wa
 
 ###  Protocol
 
-Https only.
+HTTPS only.
 
 ###  Authorization
 
@@ -40,6 +40,8 @@ cases will be "ams").
 
 - **conversationId** - The associated conversation ID.
 
+- **dialogId** - The associated dialog ID.
+
 - **push-service** - The ENUM describing the service type (APNS - 1, GCM - 2).
 
 - **originatorId** - The originator context for the push (AccountID.AgentNumber).
@@ -66,39 +68,41 @@ Android (GCM) only:
 
 **iOS JSON:**
 ```json
-    {
-    "aps":	{
-    "alert":	"My	Test:	123\\n",
-    "sound":	"default"
-    },
-    "push-service":	1,
-    "device-token":	"01408800000259",
-    "backendService":	"ams",
-    "conversationId":	"13a1ca79-22eb-4a60-8cad-cd7f9dbdb9f3",
-    "originatorId":	"qa90588718.2333061110",
-    "brandId":	"qa90588711",
-    "badge":1,
-    "sequence":8,
-    "notificationType":	"apn"
-    }
+{
+  "aps":{
+    "alert":"My Test: 123",
+    "sound":"default"
+  },
+  "push-service":1,
+  "device-token":"01408800000259",
+  "backendService":"ams",
+  "conversationId":"13a1ca79-22eb-4a60-8cad-cd7f9dbdb9f3",
+  "dialogId":"13a1ca79-22eb-4a60-8cad-cd7f9dbdb9f3",
+  "originatorId":"90588718.2333061110",
+  "brandId":"90588711",
+  "badge":1,
+  "sequence":8,
+  "notificationType":"apn"
+}
 ```
 **Android JSON:**
 
 ```json
-    {
-    "data":	{
-    "message":	"My	Test:	111\\n",
-    "payload":	{
-    "backendService":	"ams",
-    "conversationId":	"ff816d0d-3572-4430-956f-cab638d18826",
-    "originatorId":	"qa90588718.2333061110",
-    "brandId":	"qa90588711",
-    "badge":4,
-    "sequence":6
-    }
-    },
-    "push-service":	2,
-    "device-token":	"01408800000259",
-    "notificationType":	"gcm"
+{
+  "data":{
+    "message":"My Test: 456",
+    "payload":{
+      "backendService":"ams",
+      "conversationId":"ff816d0d-3572-4430-956f-cab638d18826",
+      "dialogId":"13a1ca79-22eb-4a60-8cad-cd7f9dbdb9f3",
+      "originatorId":"90588718.2333061110",
+      "brandId":"90588711",
+      "badge":4,
+      "sequence":6
     }
+  },
+  "push-service":2,
+  "device-token":"01408800000259",
+  "notificationType":"gcm"
+}
 ```