Complete solution

Author: tom-andersen

packages/firestore/src/remote/rest_connection.ts

@@ -17,7 +17,11 @@
 
 import { SDK_VERSION } from '../../src/core/version';
 import { Token } from '../api/credentials';
-import { DatabaseId, DatabaseInfo } from '../core/database_info';
+import {
+  DatabaseId,
+  DatabaseInfo,
+  DEFAULT_DATABASE_NAME
+} from '../core/database_info';
 import { debugAssert } from '../util/assert';
 import { generateUniqueDebugId } from '../util/debug_uid';
 import { FirestoreError } from '../util/error';
@@ -86,7 +90,10 @@ export abstract class RestConnection implements Connection {
     logDebug(LOG_TAG, `Sending RPC '${rpcName}' ${streamId}:`, url, req);
 
     const headers: StringMap = {
-      'x-goog-request-params': `project_id=${this.databaseId.projectId}&database_id=${this.databaseId.database}`
+      'x-goog-request-params':
+        this.databaseId.database === DEFAULT_DATABASE_NAME
+          ? `project_id=${this.databaseId.projectId}`
+          : `project_id=${this.databaseId.projectId}&database_id=${this.databaseId.database}`
     };
     this.modifyHeadersForRequest(headers, authToken, appCheckToken);
 

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

@@ -56,7 +56,7 @@ export class TestRestConnection extends RestConnection {
   }
 }
 
-describe('RestConnection', () => {
+describe.only('RestConnection', () => {
   const testDatabaseInfo = new DatabaseInfo(
     new DatabaseId('testproject'),
     'test-app-id',
@@ -97,7 +97,7 @@ describe('RestConnection', () => {
       'X-Firebase-GMPID': 'test-app-id',
       'X-Goog-Api-Client': `gl-js/ fire/${SDK_VERSION}`,
       'x-firebase-appcheck': 'some-app-check-token',
-      'x-goog-request-params': 'project_id=testproject&database_id=(default)'
+      'x-goog-request-params': 'project_id=testproject'
     });
   });
 
@@ -113,7 +113,7 @@ describe('RestConnection', () => {
       'Content-Type': 'text/plain',
       'X-Firebase-GMPID': 'test-app-id',
       'X-Goog-Api-Client': `gl-js/ fire/${SDK_VERSION}`,
-      'x-goog-request-params': 'project_id=testproject&database_id=(default)'
+      'x-goog-request-params': 'project_id=testproject'
       // Note: AppCheck token should not exist here.
     });
   });