Remove _getPrivateSettings

Author: DellaBitta

packages/firestore/src/lite-api/database.ts

@@ -72,9 +72,9 @@ export class Firestore implements FirestoreService {
 
   private _settings = new FirestoreSettingsImpl({});
   private _settingsFrozen = false;
-  private _emulatorOptions?: {
+  private _emulatorOptions: {
     mockUserToken?: EmulatorMockTokenOptions | string;
-  };
+  } = {};
 
   // A task that is assigned when the terminate() is invoked and resolved when
   // all components have shut down. Otherwise, Firestore is not terminated,
@@ -123,7 +123,7 @@ export class Firestore implements FirestoreService {
       );
     }
     this._settings = new FirestoreSettingsImpl(settings);
-    this._emulatorOptions = settings.emulatorOptions;
+    this._emulatorOptions = settings.emulatorOptions || {};
 
     if (settings.credentials !== undefined) {
       this._authCredentials = makeAuthCredentialsProvider(settings.credentials);
@@ -134,15 +134,8 @@ export class Firestore implements FirestoreService {
     return this._settings;
   }
 
-  _getPrivateSettings(): PrivateSettings {
-    const privateSettings: PrivateSettings = {
-      ...this._settings,
-      emulatorOptions: this._emulatorOptions
-    };
-    if (this._settings.localCache !== undefined) {
-      privateSettings.localCache = this._settings.localCache;
-    }
-    return privateSettings;
+  _getEmulatorOptions(): { mockUserToken?: EmulatorMockTokenOptions | string } {
+    return this._emulatorOptions;
   }
 
   _freezeSettings(): FirestoreSettingsImpl {
@@ -332,16 +325,20 @@ export function connectFirestoreEmulator(
   } = {}
 ): void {
   firestore = cast(firestore, Firestore);
-  const settings = firestore._getPrivateSettings();
-  const newHostSetting = `${host}:${port}`;
+  const settings = firestore._getSettings();
+  const existingConfig = {
+    ...settings,
+    emultorOptions: firestore._getEmulatorOptions()
+  };
 
+  const newHostSetting = `${host}:${port}`;
   if (settings.host !== DEFAULT_HOST && settings.host !== newHostSetting) {
     logWarn(
       'Host has been set in both settings() and connectFirestoreEmulator(), emulator host ' +
         'will be used.'
     );
   }
-  const newSettings = {
+  const newConfig = {
     ...settings,
     host: newHostSetting,
     ssl: false,
@@ -350,13 +347,13 @@ export function connectFirestoreEmulator(
 
   // No-op if the new configuration matches the current configuration. This supports SSR
   // enviornments which might call `connectFirestoreEmulator` multiple times as a standard practice.
-  if (deepEqual(newSettings, settings)) {
+  if (deepEqual(newConfig, existingConfig)) {
     console.error('DEDB settings are the same!');
     return;
   }
   console.error('DEDB settings differ!');
 
-  firestore._setSettings(newSettings);
+  firestore._setSettings(newConfig);
 
   if (options.mockUserToken) {
     let token: string;

packages/firestore/test/unit/api/database.test.ts

@@ -559,11 +559,9 @@ describe('Settings', () => {
     const emulatorOptions = { mockUserToken: 'test' };
     connectFirestoreEmulator(db, '127.0.0.1', 9000, emulatorOptions);
 
-    expect(db._getPrivateSettings().host).to.exist.and.to.equal(
-      '127.0.0.1:9000'
-    );
-    expect(db._getPrivateSettings().ssl).to.exist.and.to.be.false;
-    expect(db._getPrivateSettings().emulatorOptions).to.equal(emulatorOptions);
+    expect(db._getSettings().host).to.exist.and.to.equal('127.0.0.1:9000');
+    expect(db._getSettings().ssl).to.exist.and.to.be.false;
+    expect(db._getEmulatorOptions()).to.equal(emulatorOptions);
   });
 
   it('prefers host from useEmulator to host from settings', () => {