Merge remote-tracking branch 'origin/main' into mtewani/add-cookie-support-studio

Author: maneesht

.changeset/nine-pugs-crash.md

@@ -1,5 +1,4 @@
 ---
-"@firebase/app-check": patch
 "@firebase/auth": patch
 "@firebase/data-connect": patch
 "@firebase/database-compat": patch

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

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import { isCloudWorkstation } from '@firebase/util';
-
 import { Token } from '../../api/credentials';
 import { Stream } from '../../remote/connection';
 import { RestConnection } from '../../remote/rest_connection';
@@ -41,7 +39,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 +50,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,8 @@
  * limitations under the License.
  */
 
+import { isCloudWorkstation } from '@firebase/util';
+
 import { SDK_VERSION } from '../../src/core/version';
 import { Token } from '../api/credentials';
 import {
@@ -98,12 +100,15 @@ export abstract class RestConnection implements Connection {
     };
     this.modifyHeadersForRequest(headers, authToken, appCheckToken);
 
+    const { host } = new URL(url);
+    const forwardCredentials =
+      isCloudWorkstation(host);
     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 +191,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 {