From 6264f99ad500d98ff3c789e3c03cf7be0fad4446 Mon Sep 17 00:00:00 2001
From: Antonio Davi Macedo Coelho de Castro <adavimacedo@gmail.com>
Date: Mon, 28 Nov 2016 12:15:21 -0200
Subject: [PATCH] Concat appId to PubSub channel (#3043)

---
 spec/ParseCloudCodePublisher.spec.js     |  4 ++--
 src/LiveQuery/ParseCloudCodePublisher.js |  4 ++--
 src/LiveQuery/ParseLiveQueryServer.js    | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/ParseCloudCodePublisher.spec.js b/spec/ParseCloudCodePublisher.spec.js
index b5ba851c..5fba0b25 100644
--- a/spec/ParseCloudCodePublisher.spec.js
+++ b/spec/ParseCloudCodePublisher.spec.js
@@ -32,7 +32,7 @@ describe('ParseCloudCodePublisher', function() {
     var request = {};
     publisher.onCloudCodeAfterSave(request);
 
-    expect(publisher._onCloudCodeMessage).toHaveBeenCalledWith('afterSave', request);
+    expect(publisher._onCloudCodeMessage).toHaveBeenCalledWith(Parse.applicationId + 'afterSave', request);
   });
 
   it('can handle cloud code afterDelete request', function() {
@@ -41,7 +41,7 @@ describe('ParseCloudCodePublisher', function() {
     var request = {};
     publisher.onCloudCodeAfterDelete(request);
 
-    expect(publisher._onCloudCodeMessage).toHaveBeenCalledWith('afterDelete', request);
+    expect(publisher._onCloudCodeMessage).toHaveBeenCalledWith(Parse.applicationId + 'afterDelete', request);
   });
 
   it('can handle cloud code request', function() {
diff --git a/src/LiveQuery/ParseCloudCodePublisher.js b/src/LiveQuery/ParseCloudCodePublisher.js
index b50a5082..7d004f83 100644
--- a/src/LiveQuery/ParseCloudCodePublisher.js
+++ b/src/LiveQuery/ParseCloudCodePublisher.js
@@ -11,11 +11,11 @@ class ParseCloudCodePublisher {
   }
 
   onCloudCodeAfterSave(request: any): void {
-    this._onCloudCodeMessage('afterSave', request);
+    this._onCloudCodeMessage(Parse.applicationId + 'afterSave', request);
   }
 
   onCloudCodeAfterDelete(request: any): void {
-    this._onCloudCodeMessage('afterDelete', request);
+    this._onCloudCodeMessage(Parse.applicationId + 'afterDelete', request);
   }
 
   // Request is the request object from cloud code functions. request.object is a ParseObject.
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index f66d3092..b1516d1f 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -55,8 +55,8 @@ class ParseLiveQueryServer {
 
     // Initialize subscriber
     this.subscriber = ParsePubSub.createSubscriber(config);
-    this.subscriber.subscribe('afterSave');
-    this.subscriber.subscribe('afterDelete');
+    this.subscriber.subscribe(Parse.applicationId + 'afterSave');
+    this.subscriber.subscribe(Parse.applicationId + 'afterDelete');
     // Register message handler for subscriber. When publisher get messages, it will publish message
     // to the subscribers and the handler will be called.
     this.subscriber.on('message', (channel, messageStr) => {
@@ -69,9 +69,9 @@ class ParseLiveQueryServer {
         return;
       }
       this._inflateParseObject(message);
-      if (channel === 'afterSave') {
+      if (channel === Parse.applicationId + 'afterSave') {
         this._onAfterSave(message);
-      } else if (channel === 'afterDelete') {
+      } else if (channel === Parse.applicationId + 'afterDelete') {
         this._onAfterDelete(message);
       } else {
         logger.error('Get message %s from unknown channel %j', message, channel);
@@ -104,7 +104,7 @@ class ParseLiveQueryServer {
   // Message is the JSON object from publisher after inflated. Message.currentParseObject is the ParseObject after changes.
   // Message.originalParseObject is the original ParseObject.
   _onAfterDelete(message: any): void {
-    logger.verbose('afterDelete is triggered');
+    logger.verbose(Parse.applicationId + 'afterDelete is triggered');
 
     let deletedParseObject = message.currentParseObject.toJSON();
     let className = deletedParseObject.className;
@@ -145,7 +145,7 @@ class ParseLiveQueryServer {
   // Message is the JSON object from publisher after inflated. Message.currentParseObject is the ParseObject after changes.
   // Message.originalParseObject is the original ParseObject.
   _onAfterSave(message: any): void {
-    logger.verbose('afterSave is triggered');
+    logger.verbose(Parse.applicationId + 'afterSave is triggered');
 
     let originalParseObject = null;
     if (message.originalParseObject) {