Make COUNT queries available to the Firestore Console (#6643)

firebase · Oct 7, 2022 · 397317b · 397317b
1 parent 9799efe
commit 397317b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/.changeset/metal-goats-unite.md b/.changeset/metal-goats-unite.md
@@ -0,0 +1,8 @@
+---
+'@firebase/firestore': minor
+'@firebase/firestore-compat': minor
+'@firebase/webchannel-wrapper': minor
+'firebase': minor
+---
+
+Set withCredentials=true when making requests via non-streaming RPCs, like is done for streaming RPCs.
diff --git a/packages/firestore-compat/src/index.console.ts b/packages/firestore-compat/src/index.console.ts
@@ -22,8 +22,11 @@ import {
   Firestore as FirestoreExp,
   FirestoreError,
   _EmptyAuthCredentialsProvider,
-  _EmptyAppCheckTokenProvider
+  _EmptyAppCheckTokenProvider,
+  Query as ExpQuery,
+  getCountFromServer
 } from '@firebase/firestore';
+import { Compat } from '@firebase/util';
 
 import {
   Firestore as FirestoreCompat,
@@ -98,6 +101,15 @@ export class Firestore extends FirestoreCompat {
       new MemoryPersistenceProvider()
     );
   }
+
+  INTERNAL = {
+    delete: () => this.terminate(),
+    count: (query: Compat<ExpQuery<unknown>>) => {
+      return getCountFromServer(query._delegate).then(response => {
+        return response.data().count;
+      });
+    }
+  };
 }
 
 function databaseIdFromFirestoreDatabase(

diff --git a/packages/firestore/src/platform/browser/webchannel_connection.ts b/packages/firestore/src/platform/browser/webchannel_connection.ts
@@ -72,6 +72,7 @@ export class WebChannelConnection extends RestConnection {
   ): Promise<Resp> {
     return new Promise((resolve: Resolver<Resp>, reject: Rejecter) => {
       const xhr = new XhrIo();
+      xhr.setWithCredentials(true);
       xhr.listenOnce(EventType.COMPLETE, () => {
         try {
           switch (xhr.getLastErrorCode()) {

diff --git a/packages/webchannel-wrapper/src/index.d.ts b/packages/webchannel-wrapper/src/index.d.ts
@@ -74,6 +74,8 @@ export class XhrIo {
   getResponseJson(): WebChannelError | object;
 
   listenOnce(type: string, cb: (param: unknown) => void): void;
+
+  setWithCredentials(withCredentials: boolean): void;
 }
 
 export interface WebChannelOptions {

diff --git a/packages/webchannel-wrapper/src/index.js b/packages/webchannel-wrapper/src/index.js
@@ -75,6 +75,8 @@ goog.net.XhrIo.prototype['getResponseJson'] =
 goog.net.XhrIo.prototype['getResponseText'] =
   goog.net.XhrIo.prototype.getResponseText;
 goog.net.XhrIo.prototype['send'] = goog.net.XhrIo.prototype.send;
+goog.net.XhrIo.prototype['setWithCredentials'] =
+  goog.net.XhrIo.prototype.setWithCredentials;
 
 module['exports']['createWebChannelTransport'] =
   goog.net.createWebChannelTransport;