Repo key never changes

Author: samtstern

packages/database/src/core/Repo.ts

@@ -54,6 +54,9 @@ 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;
+
   dataUpdateCount = 0;
   private infoSyncTree_: SyncTree;
   private serverSyncTree_: SyncTree;
@@ -174,6 +177,9 @@ export class Repo {
         this.server_.unlisten(query, tag);
       }
     });
+
+    // This key is intentionally not updated if RepoInfo is later changed or replaced
+    this.key = this.repoInfo_.toURLString();
   }
 
   /**

packages/database/src/core/RepoManager.ts

@@ -98,17 +98,10 @@ export class RepoManager {
       ? new EmulatorAdminTokenProvider()
       : repo.authTokenProvider;
 
-    // Before we modify the repo, get the key used in the repo manager
-    const oldRepoKey = repo.repoInfo_.toURLString();
-
     // Update the repo in-place
     const { repoInfo } = parseRepoInfo(url, nodeAdmin);
     repo.repoInfo_ = repoInfo;
     repo.authTokenProvider = authTokenProvider;
-
-    // Replace the repomanager cache entry
-    delete this.repos_[repo.app.name][oldRepoKey];
-    this.repos_[repo.app.name][repoInfo.toURLString()] = repo;
   }
 
   /**
@@ -181,13 +174,13 @@ export class RepoManager {
   deleteRepo(repo: Repo) {
     const appRepos = safeGet(this.repos_, repo.app.name);
     // This should never happen...
-    if (!appRepos || safeGet(appRepos, repo.repoInfo_.toURLString()) !== repo) {
+    if (!appRepos || safeGet(appRepos, repo.key) !== repo) {
       fatal(
         `Database ${repo.app.name}(${repo.repoInfo_}) has already been deleted.`
       );
     }
     repo.interrupt();
-    delete appRepos[repo.repoInfo_.toURLString()];
+    delete appRepos[repo.key];
   }
 
   /**