indexedDb check was bad on AppCheck, dry up

Author: jamesdaniels

packages/firestore/src/local/simple_db.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { getUA } from '@firebase/util';
+import { getUA, isIndexedDBAvailable } from '@firebase/util';
 
 import { debugAssert } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
@@ -158,7 +158,7 @@ export class SimpleDb {
 
   /** Returns true if IndexedDB is available in the current environment. */
   static isAvailable(): boolean {
-    if (typeof indexedDB === 'undefined') {
+    if (!isIndexedDBAvailable()) {
       return false;
     }
 

packages/firestore/test/integration/util/helpers.ts

@@ -16,6 +16,7 @@
  */
 
 import * as firestore from '@firebase/firestore-types';
+import { isIndexedDBAvailable } from '@firebase/util';
 
 import * as firebaseExport from './firebase_export';
 import {
@@ -44,7 +45,7 @@ function isIeOrEdge(): boolean {
 export function isPersistenceAvailable(): boolean {
   return (
     typeof window === 'object' &&
-    typeof window.indexedDB === 'object' &&
+    isIndexedDBAvailable() &&
     !isIeOrEdge() &&
     (typeof process === 'undefined' ||
       process.env?.INCLUDE_FIRESTORE_PERSISTENCE !== 'false')

packages/messaging-compat/src/messaging-compat.ts

@@ -26,7 +26,13 @@ import {
   getToken,
   onMessage
 } from '@firebase/messaging';
-import { NextFn, Observer, Unsubscribe } from '@firebase/util';
+import {
+  areCookiesEnabled,
+  isIndexedDBAvailable,
+  NextFn,
+  Observer,
+  Unsubscribe
+} from '@firebase/util';
 
 import { onBackgroundMessage } from '@firebase/messaging/sw';
 
@@ -62,9 +68,8 @@ export function isSupported(): boolean {
  */
 function isWindowSupported(): boolean {
   return (
-    'indexedDB' in window &&
-    indexedDB !== null &&
-    navigator.cookieEnabled &&
+    isIndexedDBAvailable() &&
+    areCookiesEnabled() &&
     'serviceWorker' in navigator &&
     'PushManager' in window &&
     'Notification' in window &&
@@ -79,8 +84,7 @@ function isWindowSupported(): boolean {
  */
 function isSwSupported(): boolean {
   return (
-    'indexedDB' in self &&
-    indexedDB !== null &&
+    isIndexedDBAvailable() &&
     'PushManager' in self &&
     'Notification' in self &&
     ServiceWorkerRegistration.prototype.hasOwnProperty('showNotification') &&

packages/messaging/src/api/isSupported.ts

@@ -15,7 +15,10 @@
  * limitations under the License.
  */
 
-import { validateIndexedDBOpenable } from '@firebase/util';
+import {
+  isIndexedDBAvailable,
+  validateIndexedDBOpenable
+} from '@firebase/util';
 
 /**
  * Checks if all required APIs exist in the browser.
@@ -29,7 +32,7 @@ export async function isWindowSupported(): Promise<boolean> {
   // instantiating phase, informing the developers to import/call isSupported for special handling.
   return (
     typeof window !== 'undefined' &&
-    typeof indexedDB !== 'undefined' &&
+    isIndexedDBAvailable() &&
     (await validateIndexedDBOpenable()) &&
     navigator.cookieEnabled &&
     'serviceWorker' in navigator &&
@@ -52,9 +55,8 @@ export async function isSwSupported(): Promise<boolean> {
   // might be prohibited to run. In these contexts, an error would be thrown during the messaging
   // instantiating phase, informing the developers to import/call isSupported for special handling.
   return (
+    isIndexedDBAvailable() &&
     (await validateIndexedDBOpenable()) &&
-    'indexedDB' in self &&
-    indexedDB !== null &&
     'PushManager' in self &&
     'Notification' in self &&
     ServiceWorkerRegistration.prototype.hasOwnProperty('showNotification') &&

packages/util/src/environment.ts

@@ -140,7 +140,7 @@ export function isSafari(): boolean {
  * @return true if indexedDB is supported by current browser/service worker context
  */
 export function isIndexedDBAvailable(): boolean {
-  return 'indexedDB' in self && indexedDB != null;
+  return typeof indexedDB === 'object';
 }
 
 /**