Fix

Author: tom-andersen

packages/firestore/src/remote/rest_connection.ts

@@ -17,7 +17,7 @@
 
 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';
@@ -85,8 +85,10 @@ export abstract class RestConnection implements Connection {
     const url = this.makeUrl(rpcName, path);
     logDebug(LOG_TAG, `Sending RPC '${rpcName}' ${streamId}:`, url, req);
 
-    const headers = {
-      'x-goog-request-params': `project_id=${this.databaseId.projectId}&database_id=${this.databaseId.database}`
+    const headers: StringMap = {
+      '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);