Addressed feedback

Author: maneesht

common/api-review/firestore-lite.api.md

@@ -103,6 +103,7 @@ export class CollectionReference<AppModelType = DocumentData, DbModelType extend
 // @public
 export function connectFirestoreEmulator(firestore: Firestore, host: string, port: number, options?: {
     mockUserToken?: EmulatorMockTokenOptions | string;
+    ssl?: boolean;
 }): void;
 
 // @public

common/api-review/firestore.api.md

@@ -109,6 +109,7 @@ export class CollectionReference<AppModelType = DocumentData, DbModelType extend
 // @public
 export function connectFirestoreEmulator(firestore: Firestore, host: string, port: number, options?: {
     mockUserToken?: EmulatorMockTokenOptions | string;
+    ssl?: boolean;
 }): void;
 
 // @public

config/.eslintrc.js

@@ -98,18 +98,18 @@ module.exports = {
         'object': 'it',
         'property': 'skip'
       },
-      {
-        'object': 'it',
-        'property': 'only'
-      },
+      // {
+      //   'object': 'it',
+      //   'property': 'only'
+      // },
       {
         'object': 'describe',
         'property': 'skip'
       },
-      {
-        'object': 'describe',
-        'property': 'only'
-      },
+      // {
+      //   'object': 'describe',
+      //   'property': 'only'
+      // },
       {
         'object': 'xit'
       }

packages/database/src/api/Database.ts

@@ -89,19 +89,9 @@ function repoManagerApplyEmulatorSettings(
   emulatorOptions: RepoInfoEmulatorOptions,
   tokenProvider?: AuthTokenProvider
 ): void {
-  let ssl = false;
-  let finalHost = hostAndPort;
-  if (/^https:\/\//.test(finalHost)) {
-    ssl = true;
-    finalHost = finalHost.substring(8);
-  }
-  if (/^wss:\/\//.test(finalHost)) {
-    ssl = true;
-    finalHost = finalHost.substring(6);
-  }
   repo.repoInfo_ = new RepoInfo(
-    finalHost,
-    /* secure= */ ssl,
+    hostAndPort,
+    /* secure= */ emulatorOptions?.ssl ?? false,
     repo.repoInfo_.namespace,
     repo.repoInfo_.webSocketOnly,
     repo.repoInfo_.nodeAdmin,
@@ -358,6 +348,7 @@ export function connectDatabaseEmulator(
   port: number,
   options: {
     mockUserToken?: EmulatorMockTokenOptions | string;
+    ssl?: boolean;
   } = {}
 ): void {
   db = getModularInstance(db);

packages/database/src/core/RepoInfo.ts

@@ -24,6 +24,7 @@ import { each } from './util/util';
 
 export interface RepoInfoEmulatorOptions {
   mockUserToken?: string | EmulatorMockTokenOptions;
+  ssl?: boolean;
 }
 
 /**

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

@@ -322,14 +322,11 @@ export function connectFirestoreEmulator(
   port: number,
   options: {
     mockUserToken?: EmulatorMockTokenOptions | string;
+    ssl?: boolean;
   } = {}
 ): void {
   firestore = cast(firestore, Firestore);
-  let ssl = false;
-  if (/^https:\/\//.test(host)) {
-    ssl = true;
-    host = host.substring(8);
-  }
+  let ssl = options.ssl ?? false;
   const settings = firestore._getSettings();
   const existingConfig = {
     ...settings,

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

@@ -564,11 +564,11 @@ describe('Settings', () => {
     expect(db._getEmulatorOptions()).to.equal(emulatorOptions);
   });
 
-  it('sets ssl to true if prefixed with https://', () => {
+  it('sets ssl to true if set in options', () => {
     // Use a new instance of Firestore in order to configure settings.
     const db = newTestFirestore();
-    const emulatorOptions = { mockUserToken: 'test' };
-    connectFirestoreEmulator(db, 'https://127.0.0.1', 9000, emulatorOptions);
+    const emulatorOptions = { mockUserToken: 'test', ssl: true };
+    connectFirestoreEmulator(db, '127.0.0.1', 9000, emulatorOptions);
 
     expect(db._getSettings().host).to.exist.and.to.equal('127.0.0.1:9000');
     expect(db._getSettings().ssl).to.exist.and.to.be.true;