feat(firestore): add support for non-default databases #8489

Author: zeevl

packages/firestore/e2e/firestore.e2e.js

@@ -1011,5 +1011,18 @@ describe('firestore()', function () {
         events.forEach(event => event.should.equal('sync'));
       });
     });
+
+    describe('non-default db', function () {
+      it('should be able to initialize a non-default db on mobile platforms', async function () {
+        // Not supported on web lite sdk
+        if (!Platform.other) {
+          const { initializeFirestore } = firestoreModular;
+          const { getApp } = modular;
+          const app = getApp('secondaryFromNative');
+          const db = await initializeFirestore(app, { persistence: false }, 'test2ndDb');
+          db.customUrlOrRegion.should.equal('test2ndDb');
+        }
+      });
+    });
   });
 });

packages/firestore/lib/index.js

@@ -103,6 +103,11 @@ class FirebaseFirestoreModule extends FirebaseModule {
       persistence: true,
     };
   }
+
+  get customUrlOrRegion() {
+    return this._customUrlOrRegion;
+  }
+
   // We override the FirebaseModule's `eventNameForApp()` method to include the customUrlOrRegion
   eventNameForApp(...args) {
     return `${this.app.name}-${this._customUrlOrRegion}-${args.join('-')}`;

packages/firestore/lib/modular/index.js

@@ -210,10 +210,9 @@ export function waitForPendingWrites(firestore) {
  * @param {string?} databaseId
  * @returns {Promise<Firestore>}
  */
-export async function initializeFirestore(app, settings /* databaseId */) {
-  // TODO(exaby73): implement 2nd database once it's supported
+export async function initializeFirestore(app, settings, databaseId) {
   const firebase = getApp(app.name);
-  const firestore = firebase.firestore();
+  const firestore = firebase.firestore(databaseId);
   await firestore.settings.call(firestore, settings, MODULAR_DEPRECATION_ARG);
   return firestore;
 }