Moved emulator calculation to rest connection

Author: maneesht

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

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

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

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

packages/firestore/src/remote/rest_connection.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { isCloudWorkstation } from '@firebase/util';
 import { SDK_VERSION } from '../../src/core/version';
 import { Token } from '../api/credentials';
 import {
@@ -98,12 +99,15 @@ export abstract class RestConnection implements Connection {
     };
     this.modifyHeadersForRequest(headers, authToken, appCheckToken);
 
+    const { host } = new URL(url);
+    const forwardCredentials =
+      isCloudWorkstation(host) && this.databaseInfo.isUsingEmulator;
     return this.performRPCRequest<Req, Resp>(
       rpcName,
       url,
       headers,
       req,
-      this.databaseInfo.isUsingEmulator
+      forwardCredentials
     ).then(
       response => {
         logDebug(LOG_TAG, `Received RPC '${rpcName}' ${streamId}: `, response);
@@ -186,7 +190,7 @@ export abstract class RestConnection implements Connection {
     url: string,
     headers: StringMap,
     body: Req,
-    isUsingEmulator: boolean
+    _forwardCredentials: boolean
   ): Promise<Resp>;
 
   private makeUrl(rpcName: string, path: string): string {