Merge 9a2033a into b9087b9

Author: schmidt-sebastian

.changeset/honest-hounds-sin.md

@@ -0,0 +1,5 @@
+---
+"@firebase/firestore": patch
+---
+
+Added new internal HTTP header to all network requests.

packages/firestore/exp/src/api/database.ts

@@ -118,6 +118,7 @@ export class FirebaseFirestore
     await this._receivedInitialUser.promise;
     const databaseInfo = new DatabaseInfo(
       this._databaseId,
+      this.app.options.appId || '',
       this._persistenceKey,
       settings.host ?? DEFAULT_HOST,
       settings.ssl ?? DEFAULT_SSL,

packages/firestore/lite/src/api/components.ts

@@ -56,6 +56,7 @@ export function getDatastore(firestore: FirebaseFirestore): Datastore {
     const settings = firestore._getSettings();
     const databaseInfo = new DatabaseInfo(
       firestore._databaseId,
+      firestore.app.options.appId || '',
       firestore._persistenceKey,
       settings.host ?? DEFAULT_HOST,
       settings.ssl ?? DEFAULT_SSL,

packages/firestore/src/api/database.ts

@@ -549,6 +549,7 @@ export class Firestore implements PublicFirestore, FirebaseService {
   private makeDatabaseInfo(): DatabaseInfo {
     return new DatabaseInfo(
       this._databaseId,
+      this._firebaseApp?.options.appId || '',
       this._persistenceKey,
       this._settings.host,
       this._settings.ssl,

packages/firestore/src/core/database_info.ts

@@ -23,6 +23,7 @@ export class DatabaseInfo {
    * persistenceKey.
    *
    * @param databaseId The database to use.
+   * @param appId The Firebase App Id.
    * @param persistenceKey A unique identifier for this Firestore's local
    * storage (used in conjunction with the databaseId).
    * @param host The Firestore backend host to connect to.
@@ -32,6 +33,7 @@ export class DatabaseInfo {
    */
   constructor(
     readonly databaseId: DatabaseId,
+    readonly appId: string,
     readonly persistenceKey: string,
     readonly host: string,
     readonly ssl: boolean,

packages/firestore/src/platform/node/grpc_connection.ts

@@ -37,7 +37,11 @@ import { SDK_VERSION } from '../../core/version';
 const LOG_TAG = 'Connection';
 const X_GOOG_API_CLIENT_VALUE = `gl-node/${process.versions.node} fire/${SDK_VERSION} grpc/${grpcVersion}`;
 
-function createMetadata(databasePath: string, token: Token | null): Metadata {
+function createMetadata(
+  databasePath: string,
+  token: Token | null,
+  appId: string
+): Metadata {
   hardAssert(
     token === null || token.type === 'OAuth',
     'If provided, token must be OAuth'
@@ -51,10 +55,11 @@ function createMetadata(databasePath: string, token: Token | null): Metadata {
       }
     }
   }
-  metadata.set('x-goog-api-client', X_GOOG_API_CLIENT_VALUE);
+  metadata.set('X-Firebase-GMPID', appId);
+  metadata.set('X-Goog-Api-Client', X_GOOG_API_CLIENT_VALUE);
   // This header is used to improve routing and project isolation by the
   // backend.
-  metadata.set('google-cloud-resource-prefix', databasePath);
+  metadata.set('Google-Cloud-Resource-Prefix', databasePath);
   return metadata;
 }
 
@@ -101,7 +106,11 @@ export class GrpcConnection implements Connection {
     token: Token | null
   ): Promise<Resp> {
     const stub = this.ensureActiveStub();
-    const metadata = createMetadata(this.databasePath, token);
+    const metadata = createMetadata(
+      this.databasePath,
+      token,
+      this.databaseInfo.appId
+    );
     const jsonRequest = { database: this.databasePath, ...request };
 
     return nodePromise((callback: NodeCallback<Resp>) => {
@@ -146,7 +155,11 @@ export class GrpcConnection implements Connection {
       request
     );
     const stub = this.ensureActiveStub();
-    const metadata = createMetadata(this.databasePath, token);
+    const metadata = createMetadata(
+      this.databasePath,
+      token,
+      this.databaseInfo.appId
+    );
     const jsonRequest = { ...request, database: this.databasePath };
     const stream = stub[rpcName](jsonRequest, metadata);
     stream.on('data', (response: Resp) => {
@@ -172,7 +185,11 @@ export class GrpcConnection implements Connection {
     token: Token | null
   ): Stream<Req, Resp> {
     const stub = this.ensureActiveStub();
-    const metadata = createMetadata(this.databasePath, token);
+    const metadata = createMetadata(
+      this.databasePath,
+      token,
+      this.databaseInfo.appId
+    );
     const grpcStream = stub[rpcName](metadata);
 
     let closed = false;

packages/firestore/src/remote/rest_connection.ts

@@ -118,6 +118,7 @@ export abstract class RestConnection implements Connection {
     token: Token | null
   ): void {
     headers['X-Goog-Api-Client'] = X_GOOG_API_CLIENT_VALUE;
+    headers['X-Firebase-GMPID'] = this.databaseInfo.appId;
 
     // Content-Type: text/plain will avoid preflight requests which might
     // mess with CORS and redirects by proxies. If we add custom headers

packages/firestore/test/integration/util/internal_helpers.ts

@@ -41,6 +41,7 @@ export function asyncQueue(db: firestore.FirebaseFirestore): AsyncQueue {
 export function getDefaultDatabaseInfo(): DatabaseInfo {
   return new DatabaseInfo(
     new DatabaseId(DEFAULT_PROJECT_ID),
+    'test-app-id',
     'persistenceKey',
     DEFAULT_SETTINGS.host!,
     !!DEFAULT_SETTINGS.ssl,

packages/firestore/test/unit/local/persistence_test_helpers.ts

@@ -59,6 +59,7 @@ export const MOCK_SEQUENCE_NUMBER_SYNCER: SequenceNumberSyncer = {
 export const TEST_PROJECT = 'test-project';
 export const TEST_DATABASE_ID = new DatabaseId(TEST_PROJECT);
 export const TEST_PERSISTENCE_KEY = '[PersistenceTestHelpers]';
+export const TEST_APP_ID = 'test-app-id';
 
 /** The persistence prefix used for testing in IndexedBD and LocalStorage. */
 export const TEST_PERSISTENCE_PREFIX = indexedDbStoragePrefix(

packages/firestore/test/unit/remote/rest_connection.test.ts

@@ -57,6 +57,7 @@ export class TestRestConnection extends RestConnection {
 describe('RestConnection', () => {
   const testDatabaseInfo = new DatabaseInfo(
     new DatabaseId('testproject'),
+    'test-app-id',
     'persistenceKey',
     'example.com',
     /*ssl=*/ false,
@@ -90,6 +91,7 @@ describe('RestConnection', () => {
     expect(connection.lastHeaders).to.deep.equal({
       'Authorization': 'Bearer owner',
       'Content-Type': 'text/plain',
+      'X-Firebase-GMPID': 'test-app-id',
       'X-Goog-Api-Client': `gl-js/ fire/${SDK_VERSION}`
     });
   });

packages/firestore/test/unit/specs/spec_test_runner.ts

@@ -124,6 +124,7 @@ import { encodeWatchChange } from '../../util/spec_test_helpers';
 import {
   clearTestPersistence,
   INDEXEDDB_TEST_DATABASE_NAME,
+  TEST_APP_ID,
   TEST_DATABASE_ID,
   TEST_PERSISTENCE_KEY,
   TEST_SERIALIZER
@@ -238,6 +239,7 @@ abstract class TestRunner {
     this.clientId = `client${clientIndex}`;
     this.databaseInfo = new DatabaseInfo(
       TEST_DATABASE_ID,
+      TEST_APP_ID,
       TEST_PERSISTENCE_KEY,
       'host',
       /*ssl=*/ false,