Skip to content

Make COUNT queries available to the Firestore Console #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/metal-goats-unite.md
Original file line number Diff line number Diff line change
@@ -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.
14 changes: 13 additions & 1 deletion packages/firestore-compat/src/index.console.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 2 additions & 0 deletions packages/webchannel-wrapper/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions packages/webchannel-wrapper/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down