From 014ae11d1f1d3ac9181005303accec151c13e14d Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Fri, 30 Sep 2022 15:26:40 -0400 Subject: [PATCH 1/5] Call setWithCredentials(true) on XhrIo --- .../firestore/src/platform/browser/webchannel_connection.ts | 1 + packages/webchannel-wrapper/src/index.d.ts | 2 ++ packages/webchannel-wrapper/src/index.js | 1 + 3 files changed, 4 insertions(+) diff --git a/packages/firestore/src/platform/browser/webchannel_connection.ts b/packages/firestore/src/platform/browser/webchannel_connection.ts index aa4e7081062..0e9d25c9547 100644 --- 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 { return new Promise((resolve: Resolver, 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 index d680a86ece2..4a1f45f1d70 100644 --- 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 index 1cf3d2537d1..c629a3b1470 100644 --- a/packages/webchannel-wrapper/src/index.js +++ b/packages/webchannel-wrapper/src/index.js @@ -75,6 +75,7 @@ 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; From 1f2df2d439e81db998961ec12c013325ce06dc1f Mon Sep 17 00:00:00 2001 From: Laura Dannhauser <3385691+dannhauser@users.noreply.github.com> Date: Mon, 3 Oct 2022 13:36:45 -0400 Subject: [PATCH 2/5] Adding Count to be accessible to the console. (#6644) --- packages/firestore-compat/src/index.console.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/firestore-compat/src/index.console.ts b/packages/firestore-compat/src/index.console.ts index 9adfdefdfd2..23d5da739db 100644 --- 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>) => { + return getCountFromServer(query._delegate).then(response => { + return response.data().count; + }); + } + }; } function databaseIdFromFirestoreDatabase( From 28cf5b70dd1135512713a97d8989e5796cc5baf2 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 4 Oct 2022 14:04:34 -0400 Subject: [PATCH 3/5] format packages/webchannel-wrapper/src/index.js --- packages/webchannel-wrapper/src/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/webchannel-wrapper/src/index.js b/packages/webchannel-wrapper/src/index.js index c629a3b1470..c51f7d68ba3 100644 --- a/packages/webchannel-wrapper/src/index.js +++ b/packages/webchannel-wrapper/src/index.js @@ -75,7 +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; +goog.net.XhrIo.prototype['setWithCredentials'] = + goog.net.XhrIo.prototype.setWithCredentials; module['exports']['createWebChannelTransport'] = goog.net.createWebChannelTransport; From 4a08b758317d54473709ad179ff3899d88c53231 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 5 Oct 2022 12:10:07 -0400 Subject: [PATCH 4/5] changeset added --- .changeset/metal-goats-unite.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/metal-goats-unite.md diff --git a/.changeset/metal-goats-unite.md b/.changeset/metal-goats-unite.md new file mode 100644 index 00000000000..bc810b44630 --- /dev/null +++ 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. From 58a29f71cf5288d83149b54835a67095dc05971e Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 6 Oct 2022 15:17:57 -0400 Subject: [PATCH 5/5] empty commit to trigger GitHub Actions