[Auth] Fix persistence selection in compatibility layer in worker scr…

…ipts (#5811) * Fix persistence selection in compatability layer in worker scripts * Add changeset
firebase · Dec 10, 2021 · e3a5248 · e3a5248
1 parent fd8cd3e
commit e3a5248
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 21 deletions.
diff --git a/.changeset/cuddly-birds-stare.md b/.changeset/cuddly-birds-stare.md
@@ -0,0 +1,6 @@
+---
+"@firebase/auth-compat": patch
+"@firebase/auth": patch
+---
+
+Fix persistence selection in compatibility layer in worker scripts
diff --git a/packages/auth-compat/src/auth.ts b/packages/auth-compat/src/auth.ts
@@ -57,26 +57,6 @@ export class Auth
       appName: app.name
     });
 
-    let persistences: exp.Persistence[] = [exp.inMemoryPersistence];
-
-    // Only deal with persistences in web environments
-    if (typeof window !== 'undefined') {
-      // Note this is slightly different behavior: in this case, the stored
-      // persistence is checked *first* rather than last. This is because we want
-      // to prefer stored persistence type in the hierarchy.
-      persistences = _getPersistencesFromRedirect(apiKey, app.name);
-
-      for (const persistence of [
-        exp.indexedDBLocalPersistence,
-        exp.browserLocalPersistence,
-        exp.browserSessionPersistence
-      ]) {
-        if (!persistences.includes(persistence)) {
-          persistences.push(persistence);
-        }
-      }
-    }
-
     // TODO: platform needs to be determined using heuristics
     _assert(apiKey, exp.AuthErrorCode.INVALID_API_KEY, {
       appName: app.name
@@ -87,7 +67,7 @@ export class Auth
       typeof window !== 'undefined' ? CompatPopupRedirectResolver : undefined;
     this._delegate = provider.initialize({
       options: {
-        persistence: persistences,
+        persistence: buildPersistenceHierarchy(apiKey, app.name),
         popupRedirectResolver: resolver
       }
     }) as exp.AuthImpl;
@@ -382,3 +362,41 @@ function wrapObservers(
     complete
   };
 }
+
+function buildPersistenceHierarchy(
+  apiKey: string,
+  appName: string
+): exp.Persistence[] {
+  // Note this is slightly different behavior: in this case, the stored
+  // persistence is checked *first* rather than last. This is because we want
+  // to prefer stored persistence type in the hierarchy. This is an empty
+  // array if window is not available or there is no pending redirect
+  const persistences = _getPersistencesFromRedirect(apiKey, appName);
+
+  // If "self" is available, add indexedDB
+  if (
+    typeof self !== 'undefined' &&
+    !persistences.includes(exp.indexedDBLocalPersistence)
+  ) {
+    persistences.push(exp.indexedDBLocalPersistence);
+  }
+
+  // If "window" is available, add HTML Storage persistences
+  if (typeof window !== 'undefined') {
+    for (const persistence of [
+      exp.browserLocalPersistence,
+      exp.browserSessionPersistence
+    ]) {
+      if (!persistences.includes(persistence)) {
+        persistences.push(persistence);
+      }
+    }
+  }
+
+  // Add in-memory as a final fallback
+  if (!persistences.includes(exp.inMemoryPersistence)) {
+    persistences.push(exp.inMemoryPersistence);
+  }
+
+  return persistences;
+}