Passed in emulator information

Author: maneesht

packages/firestore/src/core/database_info.ts

@@ -48,7 +48,8 @@ export class DatabaseInfo {
     readonly forceLongPolling: boolean,
     readonly autoDetectLongPolling: boolean,
     readonly longPollingOptions: ExperimentalLongPollingOptions,
-    readonly useFetchStreams: boolean
+    readonly useFetchStreams: boolean,
+    readonly isUsingEmulator: boolean
   ) {}
 }
 

packages/firestore/src/lite-api/components.ts

@@ -28,7 +28,7 @@ import { Datastore, newDatastore } from '../remote/datastore';
 import { Code, FirestoreError } from '../util/error';
 import { logDebug } from '../util/log';
 
-import { FirestoreSettingsImpl } from './settings';
+import { FirestoreSettingsImpl, PrivateSettings } from './settings';
 
 export const LOG_TAG = 'ComponentProvider';
 
@@ -110,6 +110,7 @@ export function makeDatabaseInfo(
   persistenceKey: string,
   settings: FirestoreSettingsImpl
 ): DatabaseInfo {
+  const privateSettings = settings as PrivateSettings;
   return new DatabaseInfo(
     databaseId,
     appId,
@@ -119,6 +120,7 @@ export function makeDatabaseInfo(
     settings.experimentalForceLongPolling,
     settings.experimentalAutoDetectLongPolling,
     cloneLongPollingOptions(settings.experimentalLongPollingOptions),
-    settings.useFetchStreams
+    settings.useFetchStreams,
+    privateSettings.emulatorOptions !== undefined
   );
 }

packages/firestore/src/platform/browser/webchannel_connection.ts

@@ -71,7 +71,8 @@ export class WebChannelConnection extends RestConnection {
     rpcName: string,
     url: string,
     headers: StringMap,
-    body: Req
+    body: Req,
+    _isUsingEmulator: boolean
   ): Promise<Resp> {
     const streamId = generateUniqueDebugId();
     return new Promise((resolve: Resolver<Resp>, reject: Rejecter) => {

packages/firestore/src/platform/browser_lite/fetch_connection.ts

@@ -40,7 +40,8 @@ export class FetchConnection extends RestConnection {
     rpcName: string,
     url: string,
     headers: StringMap,
-    body: Req
+    body: Req,
+    isUsingEmulator: boolean
   ): Promise<Resp> {
     const requestJson = JSON.stringify(body);
     let response: Response;
@@ -51,7 +52,7 @@ export class FetchConnection extends RestConnection {
         headers,
         body: requestJson
       };
-      if (isCloudWorkstation(url)) {
+      if (isCloudWorkstation(url) && isUsingEmulator) {
         fetchArgs.credentials = 'include';
       }
       response = await fetch(url, fetchArgs);

packages/firestore/src/remote/rest_connection.ts

@@ -98,7 +98,7 @@ export abstract class RestConnection implements Connection {
     };
     this.modifyHeadersForRequest(headers, authToken, appCheckToken);
 
-    return this.performRPCRequest<Req, Resp>(rpcName, url, headers, req).then(
+    return this.performRPCRequest<Req, Resp>(rpcName, url, headers, req, this.databaseInfo.isUsingEmulator).then(
       response => {
         logDebug(LOG_TAG, `Received RPC '${rpcName}' ${streamId}: `, response);
         return response;
@@ -179,7 +179,8 @@ export abstract class RestConnection implements Connection {
     rpcName: string,
     url: string,
     headers: StringMap,
-    body: Req
+    body: Req,
+    isUsingEmulator: boolean
   ): Promise<Resp>;
 
   private makeUrl(rpcName: string, path: string): string {

packages/firestore/test/integration/util/internal_helpers.ts

@@ -61,7 +61,8 @@ export function getDefaultDatabaseInfo(): DatabaseInfo {
     cloneLongPollingOptions(
       DEFAULT_SETTINGS.experimentalLongPollingOptions ?? {}
     ),
-    /*use FetchStreams= */ false
+    /*use FetchStreams= */ false,
+    /*isUsingEmulator=*/false
   );
 }
 

packages/firestore/test/unit/remote/rest_connection.test.ts

@@ -67,7 +67,8 @@ describe('RestConnection', () => {
     /*forceLongPolling=*/ false,
     /*autoDetectLongPolling=*/ false,
     /*longPollingOptions=*/ {},
-    /*useFetchStreams=*/ false
+    /*useFetchStreams=*/ false,
+    /*isUsingEmulator=*/ false
   );
   const connection = new TestRestConnection(testDatabaseInfo);
 

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -282,7 +282,8 @@ abstract class TestRunner {
       /*forceLongPolling=*/ false,
       /*autoDetectLongPolling=*/ false,
       /*longPollingOptions=*/ {},
-      /*useFetchStreams=*/ false
+      /*useFetchStreams=*/ false,
+      /*isUsingEmulator=*/ false
     );
 
     // TODO(mrschmidt): During client startup in `firestore_client`, we block