Merge branch 'firestore-multi-tab' of https://github.com/firebase/firebase-js-sdk into firestore-multi-tab

Author: schmidt-sebastian

packages/firestore/src/local/shared_client_state.ts

@@ -38,26 +38,25 @@ import { batchIdSet, TargetIdSet, targetIdSet } from '../model/collections';
 
 const LOG_TAG = 'SharedClientState';
 
-// TODO(multitab): Change prefix of keys to "firestore_" to match IndexedDb.
-
 // The format of the LocalStorage key that stores the client state is:
-//     fs_clients_<persistence_prefix>_<instance_key>
-const CLIENT_STATE_KEY_PREFIX = 'fs_clients';
+//     firestore_clients_<persistence_prefix>_<instance_key>
+const CLIENT_STATE_KEY_PREFIX = 'firestore_clients';
 
 // The format of the LocalStorage key that stores the mutation state is:
-//     fs_mutations_<persistence_prefix>_<batch_id> (for unauthenticated users)
-// or: fs_mutations_<persistence_prefix>_<batch_id>_<user_uid>
+//     firestore_mutations_<persistence_prefix>_<batch_id>
+//     (for unauthenticated users)
+// or: firestore_mutations_<persistence_prefix>_<batch_id>_<user_uid>
 //
 // 'user_uid' is last to avoid needing to escape '_' characters that it might
 // contain.
-const MUTATION_BATCH_KEY_PREFIX = 'fs_mutations';
+const MUTATION_BATCH_KEY_PREFIX = 'firestore_mutations';
 
 // The format of the LocalStorage key that stores a query target's metadata is:
-//     fs_targets_<persistence_prefix>_<target_id>
-const QUERY_TARGET_KEY_PREFIX = 'fs_targets';
+//     firestore_targets_<persistence_prefix>_<target_id>
+const QUERY_TARGET_KEY_PREFIX = 'firestore_targets';
 
 // The LocalStorage key that stores the primary tab's online state.
-const ONLINE_STATE_KEY = 'fs_online_state';
+const ONLINE_STATE_KEY = 'firestore_online_state';
 
 /**
  * A randomly-generated key assigned to each Firestore instance at startup.

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

@@ -45,7 +45,7 @@ export const TEST_PERSISTENCE_PREFIX =
   'firestore/[DEFAULT]/PersistenceTestHelpers';
 
 /** The prefix used by the keys that Firestore writes to Local Storage. */
-const LOCAL_STORAGE_PREFIX = 'fs_';
+const LOCAL_STORAGE_PREFIX = 'firestore_';
 
 /**
  * Creates and starts an IndexedDbPersistence instance for testing, destroying

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

@@ -61,22 +61,24 @@ const TEST_ERROR = new FirestoreError('internal', 'Test Error');
 
 function mutationKey(user: User, batchId: BatchId): string {
   if (user.isAuthenticated()) {
-    return `fs_mutations_${
+    return `firestore_mutations_${
       persistenceHelpers.TEST_PERSISTENCE_PREFIX
     }_${batchId}_${user.uid}`;
   } else {
-    return `fs_mutations_${
+    return `firestore_mutations_${
       persistenceHelpers.TEST_PERSISTENCE_PREFIX
     }_${batchId}`;
   }
 }
 
 function targetKey(targetId: TargetId): string {
-  return `fs_targets_${persistenceHelpers.TEST_PERSISTENCE_PREFIX}_${targetId}`;
+  return `firestore_targets_${
+    persistenceHelpers.TEST_PERSISTENCE_PREFIX
+  }_${targetId}`;
 }
 
 function onlineStateKey(): string {
-  return 'fs_online_state';
+  return 'firestore_online_state';
 }
 
 interface TestSharedClientState {
@@ -227,7 +229,7 @@ describe('WebStorageSharedClientState', () => {
   ): void {
     const actual = JSON.parse(
       localStorage.getItem(
-        `fs_clients_${
+        `firestore_clients_${
           persistenceHelpers.TEST_PERSISTENCE_PREFIX
         }_${primaryClientId}`
       )
@@ -405,7 +407,7 @@ describe('WebStorageSharedClientState', () => {
 
   describe('combines client state', () => {
     const secondaryClientId = AutoId.newId();
-    const secondaryClientStateKey = `fs_clients_${
+    const secondaryClientStateKey = `firestore_clients_${
       persistenceHelpers.TEST_PERSISTENCE_PREFIX
     }_${secondaryClientId}`;
 
@@ -578,7 +580,7 @@ describe('WebStorageSharedClientState', () => {
     });
 
     it('ignores invalid data', async () => {
-      const secondaryClientStateKey = `fs_clients_${
+      const secondaryClientStateKey = `firestore_clients_${
         persistenceHelpers.TEST_PERSISTENCE_PREFIX
       }_${AutoId.newId()}`;
 
@@ -725,10 +727,10 @@ describe('WebStorageSharedClientState', () => {
     const firstClientTargetId: TargetId = 1;
     const secondClientTargetId: TargetId = 2;
 
-    const firstClientStorageKey = `fs_clients_${
+    const firstClientStorageKey = `firestore_clients_${
       persistenceHelpers.TEST_PERSISTENCE_PREFIX
     }_${AutoId.newId()}`;
-    const secondClientStorageKey = `fs_clients_${
+    const secondClientStorageKey = `firestore_clients_${
       persistenceHelpers.TEST_PERSISTENCE_PREFIX
     }_${AutoId.newId()}`;