From f322939823d803391764ad4b9a613c24e4221a02 Mon Sep 17 00:00:00 2001
From: Diamond Lewis <findlewis@gmail.com>
Date: Mon, 4 Nov 2019 14:47:55 -0600
Subject: [PATCH] Fix installationId on LiveQuery connect

Throws an error and prevents LiveQuery from reconnecting.

Fixes Monitoring installationId.
Allow installationId to be sent to and from client.
---
 spec/ParseLiveQueryServer.spec.js     |  3 +--
 src/LiveQuery/Client.js               |  6 +++++-
 src/LiveQuery/ParseLiveQueryServer.js | 10 ++++------
 src/LiveQuery/RequestSchema.js        |  3 +++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/spec/ParseLiveQueryServer.spec.js b/spec/ParseLiveQueryServer.spec.js
index b59ac19450..63ac0a0505 100644
--- a/spec/ParseLiveQueryServer.spec.js
+++ b/spec/ParseLiveQueryServer.spec.js
@@ -337,7 +337,6 @@ describe('ParseLiveQueryServer', function() {
       query: query,
       requestId: requestId,
       sessionToken: 'sessionToken',
-      installationId: 'installationId',
     };
     parseLiveQueryServer._handleSubscribe(parseWebSocket, request);
 
@@ -360,7 +359,6 @@ describe('ParseLiveQueryServer', function() {
     expect(args[0]).toBe(requestId);
     expect(args[1].fields).toBe(query.fields);
     expect(args[1].sessionToken).toBe(request.sessionToken);
-    expect(args[1].installationId).toBe(request.installationId);
     // Make sure we send subscribe response to the client
     expect(client.pushSubscribe).toHaveBeenCalledWith(requestId);
   });
@@ -518,6 +516,7 @@ describe('ParseLiveQueryServer', function() {
     const connectRequest = {
       op: 'connect',
       applicationId: '1',
+      installationId: '1234',
     };
     // Trigger message event
     parseWebSocket.emit('message', connectRequest);
diff --git a/src/LiveQuery/Client.js b/src/LiveQuery/Client.js
index 3e1d8d0686..40e934d0fc 100644
--- a/src/LiveQuery/Client.js
+++ b/src/LiveQuery/Client.js
@@ -16,6 +16,7 @@ class Client {
   parseWebSocket: any;
   hasMasterKey: boolean;
   sessionToken: string;
+  installationId: string;
   userId: string;
   roles: Array<string>;
   subscriptionInfos: Object;
@@ -32,12 +33,14 @@ class Client {
     id: number,
     parseWebSocket: any,
     hasMasterKey: boolean = false,
-    sessionToken: string
+    sessionToken: string,
+    installationId: string
   ) {
     this.id = id;
     this.parseWebSocket = parseWebSocket;
     this.hasMasterKey = hasMasterKey;
     this.sessionToken = sessionToken;
+    this.installationId = installationId;
     this.roles = [];
     this.subscriptionInfos = new Map();
     this.pushConnect = this._pushEvent('connected');
@@ -93,6 +96,7 @@ class Client {
       const response: Message = {
         op: type,
         clientId: this.id,
+        installationId: this.installationId,
       };
       if (typeof subscriptionId !== 'undefined') {
         response['requestId'] = subscriptionId;
diff --git a/src/LiveQuery/ParseLiveQueryServer.js b/src/LiveQuery/ParseLiveQueryServer.js
index b902ed151e..1a44e03a06 100644
--- a/src/LiveQuery/ParseLiveQueryServer.js
+++ b/src/LiveQuery/ParseLiveQueryServer.js
@@ -584,7 +584,8 @@ class ParseLiveQueryServer {
       clientId,
       parseWebsocket,
       hasMasterKey,
-      request.sessionToken
+      request.sessionToken,
+      request.installationId
     );
     parseWebsocket.clientId = clientId;
     this.clients.set(parseWebsocket.clientId, client);
@@ -679,9 +680,6 @@ class ParseLiveQueryServer {
     if (request.sessionToken) {
       subscriptionInfo.sessionToken = request.sessionToken;
     }
-    if (request.installationId) {
-      subscriptionInfo.installationId = request.installationId;
-    }
     client.addSubscriptionInfo(request.requestId, subscriptionInfo);
 
     // Add clientId to subscription
@@ -703,7 +701,7 @@ class ParseLiveQueryServer {
       subscriptions: this.subscriptions.size,
       sessionToken: request.sessionToken,
       useMasterKey: client.hasMasterKey,
-      installationId: request.installationId,
+      installationId: client.installationId,
     });
   }
 
@@ -785,7 +783,7 @@ class ParseLiveQueryServer {
       subscriptions: this.subscriptions.size,
       sessionToken: subscriptionInfo.sessionToken,
       useMasterKey: client.hasMasterKey,
-      installationId: subscriptionInfo.installationId,
+      installationId: client.installationId,
     });
 
     if (!notifyClient) {
diff --git a/src/LiveQuery/RequestSchema.js b/src/LiveQuery/RequestSchema.js
index 7603fbf9af..14cb2f046b 100644
--- a/src/LiveQuery/RequestSchema.js
+++ b/src/LiveQuery/RequestSchema.js
@@ -36,6 +36,9 @@ const connect = {
     sessionToken: {
       type: 'string',
     },
+    installationId: {
+      type: 'string',
+    },
   },
   required: ['op', 'applicationId'],
   additionalProperties: false,