Attempt to delete client metadata row (#1131)

Author: schmidt-sebastian

packages/firestore/src/local/shared_client_state.ts

@@ -624,6 +624,11 @@ export class WebStorageSharedClientState implements SharedClientState {
     }
 
     this.earlyEvents = [];
+
+    // Register a window unload hook to remove the client metadata entry from
+    // LocalStorage even if `shutdown()` was not called.
+    this.platform.window.addEventListener('unload', () => this.shutdown());
+
     this.started = true;
   }
 
@@ -728,13 +733,11 @@ export class WebStorageSharedClientState implements SharedClientState {
   }
 
   shutdown(): void {
-    assert(
-      this.started,
-      'WebStorageSharedClientState.shutdown() called when not started'
-    );
-    this.platform.window.removeEventListener('storage', this.storageListener);
-    this.removeItem(this.localClientStorageKey);
-    this.started = false;
+    if (this.started) {
+      this.platform.window.removeEventListener('storage', this.storageListener);
+      this.removeItem(this.localClientStorageKey);
+      this.started = false;
+    }
   }
 
   private getItem(key: string): string | null {

packages/firestore/test/unit/local/web_storage_shared_client_state.test.ts

@@ -191,8 +191,9 @@ describe('WebStorageSharedClientState', () => {
     // client. If we directly relied on LocalStorage listeners, we would not
     // receive events for local writes.
     window.addEventListener = (type, callback) => {
-      expect(type).to.equal('storage');
-      localStorageCallbacks.push(callback);
+      if (type === 'storage') {
+        localStorageCallbacks.push(callback);
+      }
     };
     window.removeEventListener = () => {};