Merge afd9f76 into 364e336

Author: schmidt-sebastian

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

@@ -56,7 +56,9 @@ function createMetadata(
       }
     }
   }
-  metadata.set('X-Firebase-GMPID', appId);
+  if (appId) {
+    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.

packages/firestore/src/remote/rest_connection.ts

@@ -119,14 +119,16 @@ 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
     // we will need to change this code to potentially use the $httpOverwrite
     // parameter supported by ESF to avoid triggering preflight requests.
     headers['Content-Type'] = 'text/plain';
 
+    if (this.databaseInfo.appId) {
+      headers['X-Firebase-GMPID'] = this.databaseInfo.appId;
+    }
     if (token) {
       for (const header in token.authHeaders) {
         if (token.authHeaders.hasOwnProperty(header)) {