Added applicationid to websocket connection

Author: maneesht

packages/database/src/realtime/WebSocketConnection.ts

@@ -25,6 +25,7 @@ import { logWrapper, splitStringBySize } from '../core/util/util';
 import { SDK_VERSION } from '../core/version';
 
 import {
+  APPLICATION_ID_PARAM,
   APP_CHECK_TOKEN_PARAM,
   FORGE_DOMAIN_RE,
   FORGE_REF,
@@ -99,7 +100,8 @@ export class WebSocketConnection implements Transport {
       repoInfo,
       transportSessionId,
       lastSessionId,
-      appCheckToken
+      appCheckToken,
+      applicationId
     );
     this.nodeAdmin = repoInfo.nodeAdmin;
   }
@@ -115,7 +117,8 @@ export class WebSocketConnection implements Transport {
     repoInfo: RepoInfo,
     transportSessionId?: string,
     lastSessionId?: string,
-    appCheckToken?: string
+    appCheckToken?: string,
+    applicationId?: string
   ): string {
     const urlParams: { [k: string]: string } = {};
     urlParams[VERSION_PARAM] = PROTOCOL_VERSION;
@@ -137,6 +140,9 @@ export class WebSocketConnection implements Transport {
     if (appCheckToken) {
       urlParams[APP_CHECK_TOKEN_PARAM] = appCheckToken;
     }
+    if(applicationId) {
+      urlParams[APPLICATION_ID_PARAM] = applicationId;
+    }
 
     return repoInfoConnectionURL(repoInfo, WEBSOCKET, urlParams);
   }
@@ -156,6 +162,7 @@ export class WebSocketConnection implements Transport {
     PersistentStorage.set('previous_websocket_failure', true);
 
     try {
+      let options: { [k: string]: object };
       if (isNodeSdk()) {
         const device = this.nodeAdmin ? 'AdminNode' : 'Node';
         // UA Format: Firebase/<wire_protocol>/<sdk_version>/<platform>/<device>
@@ -189,16 +196,8 @@ export class WebSocketConnection implements Transport {
           options['proxy'] = { origin: proxy };
         }
 
-        this.mySock = new WebSocketImpl(this.connURL, [], options);
-      } else {
-        const options: { [k: string]: object } = {
-          headers: {
-            'X-Firebase-GMPID': this.applicationId || '',
-            'X-Firebase-AppCheck': this.appCheckToken || ''
-          }
-        };
-        this.mySock = new WebSocketImpl(this.connURL, [], options);
       }
+        this.mySock = new WebSocketImpl(this.connURL, [], options);
     } catch (e) {
       this.log_('Error instantiating WebSocket.');
       const error = e.message || e.data;

packages/database/test/websocketconnection.test.ts

@@ -0,0 +1,23 @@
+import { expect } from "chai";
+
+import { APPLICATION_ID_PARAM } from "../src/realtime/Constants";
+import { WebSocketConnection } from "../src/realtime/WebSocketConnection";
+
+import { testRepoInfo } from "./helpers/util";
+
+describe('WebSocketConnection', () => {
+    it('should add an applicationId to the query parameter', () => {
+        const repoInfo = testRepoInfo('https://test-ns.firebaseio.com');
+        const applicationId = 'myID';
+        const websocketConnection = new WebSocketConnection('connId', repoInfo, applicationId);
+        const searchParams = new URL(websocketConnection.connURL).searchParams;
+        expect(searchParams.get(APPLICATION_ID_PARAM)).to.equal(applicationId);
+    });
+    it('should not add an applicationId to the query parameter if applicationId is empty', () => {
+        const repoInfo = testRepoInfo('https://test-ns.firebaseio.com');
+        const applicationId = '';
+        const websocketConnection = new WebSocketConnection('connId', repoInfo, applicationId);
+        const searchParams = new URL(websocketConnection.connURL).searchParams;
+        expect(searchParams.get(APPLICATION_ID_PARAM)).to.be.null;
+    });
+});