Combine two fields, add a test, accept localhost in refFromURL

Author: samtstern

packages/database/src/api/Database.ts

@@ -16,7 +16,7 @@
  */
 
 import { fatal } from '../core/util/util';
-import { parseRepoInfo } from '../core/util/libs/parser';
+import { parseDatabaseURL, parseRepoInfo } from '../core/util/libs/parser';
 import { Path } from '../core/util/Path';
 import { Reference } from './Reference';
 import { Repo } from '../core/Repo';
@@ -156,16 +156,21 @@ export class Database implements FirebaseService {
     const parsedURL = parseRepoInfo(url, this.repo_.repoInfo_.nodeAdmin);
     validateUrl(apiName, 1, parsedURL);
 
-    const repoInfo = parsedURL.repoInfo;
-    const expectedHost = this.repo_.originalHost;
-    if (repoInfo.host !== expectedHost) {
+    const newHost = parsedURL.repoInfo.host;
+    const originalHost = parseDatabaseURL(this.repo_.productionUrl).host;
+    const currentHost = this.repo_.repoInfo_.host;
+    if (newHost !== originalHost && newHost !== currentHost) {
+      const expected = originalHost === currentHost
+          ? originalHost
+          : `${originalHost} or ${currentHost}`;
+      
       fatal(
         apiName +
           ': Host name does not match the current database: ' +
           '(found ' +
-          repoInfo.host +
+          newHost +
           ' but expected ' +
-          expectedHost +
+          expected +
           ')'
       );
     }

packages/database/src/core/Repo.ts

@@ -54,11 +54,8 @@ const INTERRUPT_REASON = 'repo_interrupt';
  * A connection to a single data repository.
  */
 export class Repo {
-  /** Key for uniquely identifying this repo, used in RepoManager */
-  readonly key: string;
-
   /** Record of the original host, which does not change even if useEmulator mutates the repo */
-  readonly originalHost: string;
+  readonly productionUrl: string;
 
   dataUpdateCount = 0;
   private infoSyncTree_: SyncTree;
@@ -91,9 +88,7 @@ export class Repo {
     public app: FirebaseApp,
     public authTokenProvider_: AuthTokenProvider
   ) {
-    // This key is intentionally not updated if RepoInfo is later changed or replaced
-    this.key = this.repoInfo_.toURLString();
-    this.originalHost = this.repoInfo_.host;
+    this.productionUrl = this.repoInfo_.toURLString();
   }
 
   start(): void {

packages/database/src/core/RepoManager.ts

@@ -176,13 +176,13 @@ export class RepoManager {
   deleteRepo(repo: Repo) {
     const appRepos = safeGet(this.repos_, repo.app.name);
     // This should never happen...
-    if (!appRepos || safeGet(appRepos, repo.key) !== repo) {
+    if (!appRepos || safeGet(appRepos, repo.productionUrl) !== repo) {
       fatal(
         `Database ${repo.app.name}(${repo.repoInfo_}) has already been deleted.`
       );
     }
     repo.interrupt();
-    delete appRepos[repo.key];
+    delete appRepos[repo.productionUrl];
   }
 
   /**

packages/database/test/database.test.ts

@@ -286,4 +286,12 @@ describe('Database Tests', () => {
     const ref = db.refFromURL(DATABASE_ADDRESS + '/path/to/data');
     expect(ref.toString()).to.equal(`http://localhost:1234/path/to/data`);
   });
+
+  it('refFromURL accepts an emulated ref with useEmulator', () => {
+    const db = (firebase as any).database();
+    db.useEmulator('localhost', 1234);
+
+    const ref = db.refFromURL('http://localhost:1234/path/to/data');
+    expect(ref.toString()).to.equal(`http://localhost:1234/path/to/data`);
+  });
 });