Cleanup

Author: schmidt-sebastian

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

@@ -22,6 +22,7 @@ import { FirebaseFirestore, Settings } from './database';
 import { DatabaseId, DatabaseInfo } from '../../../src/core/database_info';
 import { logDebug } from '../../../src/util/log';
 import { Code, FirestoreError } from '../../../src/util/error';
+import { FirestoreSettings } from '../../../src/api/database';
 
 export const LOG_TAG = 'ComponentProvider';
 
@@ -87,14 +88,14 @@ export function removeComponents(firestore: FirebaseFirestore): void {
 export function makeDatabaseInfo(
   databaseId: DatabaseId,
   persistenceKey: string,
-  settings: Settings
+  settings: FirestoreSettings
 ): DatabaseInfo {
   return new DatabaseInfo(
     databaseId,
     persistenceKey,
-    settings.host ?? DEFAULT_HOST,
-    settings.ssl ?? DEFAULT_SSL,
-    /* forceLongPolling= */ false,
-    /* forceAutoDetectLongPolling= */ true
+    settings.host,
+    settings.ssl,
+    settings.experimentalForceLongPolling,
+    settings.experimentalAutoDetectLongPolling
   );
 }

packages/firestore/src/api/database.ts

@@ -154,6 +154,7 @@ import {
   LRU_DEFAULT_CACHE_SIZE_BYTES,
   LRU_MINIMUM_CACHE_SIZE_BYTES
 } from '../local/lru_garbage_collector';
+import { makeDatabaseInfo } from '../../lite/src/api/components';
 
 // settings() defaults:
 const DEFAULT_HOST = 'firestore.googleapis.com';
@@ -662,13 +663,10 @@ export function configureFirestore(firestore: FirestoreCompat): void {
     'configureFirestore() called multiple times'
   );
 
-  const databaseInfo = new DatabaseInfo(
+  const databaseInfo = makeDatabaseInfo(
     firestore._databaseId,
     firestore._persistenceKey,
-    settings.host,
-    settings.ssl,
-    settings.experimentalForceLongPolling,
-    settings.experimentalAutoDetectLongPolling
+    settings
   );
   firestore._firestoreClient = new FirestoreClient(
     firestore._credentials,