Fix bug in terminate() (#3532)

schmidt-sebastian · web-flow · commit 434c110e6d87 · 2020-07-31T17:03:27.000-07:00
diff --git a/packages/firestore/exp/src/api/database.ts b/packages/firestore/exp/src/api/database.ts
@@ -134,8 +134,12 @@ export class Firestore extends LiteFirestore
     debugAssert(!this._terminated, 'Cannot invoke _terminate() more than once');
     return this._queue.enqueueAndInitiateShutdown(async () => {
       await super._terminate();
-      this._credentials.removeChangeListener();
       await removeComponents(this);
+
+      // `removeChangeListener` must be called after shutting down the
+      // RemoteStore as it will prevent the RemoteStore from retrieving
+      // auth tokens.
+      this._credentials.removeChangeListener();
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,12 @@ export class Firestore extends LiteFirestore`
`134`	`134`	`debugAssert(!this._terminated, 'Cannot invoke _terminate() more than once');`
`135`	`135`	`return this._queue.enqueueAndInitiateShutdown(async () => {`
`136`	`136`	`await super._terminate();`
`137`		`- this._credentials.removeChangeListener();`
`138`	`137`	`await removeComponents(this);`
	`138`	`+`
	`139`	+ // `removeChangeListener` must be called after shutting down the
	`140`	`+ // RemoteStore as it will prevent the RemoteStore from retrieving`
	`141`	`+ // auth tokens.`
	`142`	`+ this._credentials.removeChangeListener();`
`139`	`143`	`});`
`140`	`144`	`}`
`141`	`145`	`}`