Merge 5859165 into 3bf55f6

Author: dplewis

package-lock.json

@@ -6,28 +6,33 @@
 import { createStore, del, set, get, clear, keys } from 'idb-keyval';
 
 if (typeof window !== 'undefined' && window.indexedDB) {
-  const ParseStore = createStore('parseDB', 'parseStore');
+  try {
+    const ParseStore = createStore('parseDB', 'parseStore');
 
-  const IndexedDBStorageController = {
-    async: 1,
-    getItemAsync(path: string) {
-      return get(path, ParseStore);
-    },
-    setItemAsync(path: string, value: string) {
-      return set(path, value, ParseStore);
-    },
-    removeItemAsync(path: string) {
-      return del(path, ParseStore);
-    },
-    getAllKeysAsync() {
-      return keys(ParseStore);
-    },
-    clear() {
-      return clear(ParseStore);
-    },
-  };
+    const IndexedDBStorageController = {
+      async: 1,
+      getItemAsync(path: string) {
+        return get(path, ParseStore);
+      },
+      setItemAsync(path: string, value: string) {
+        return set(path, value, ParseStore);
+      },
+      removeItemAsync(path: string) {
+        return del(path, ParseStore);
+      },
+      getAllKeysAsync() {
+        return keys(ParseStore);
+      },
+      clear() {
+        return clear(ParseStore);
+      },
+    };
 
-  module.exports = IndexedDBStorageController;
+    module.exports = IndexedDBStorageController;
+  } catch (_) {
+    // IndexedDB not accessible
+    module.exports = undefined;
+  }
 } else {
   // IndexedDB not supported
   module.exports = undefined;

src/IndexedDBStorageController.js

@@ -2,6 +2,7 @@ import decode from './decode';
 import encode from './encode';
 import CryptoController from './CryptoController';
 import EventuallyQueue from './EventuallyQueue';
+import IndexedDBStorageController from './IndexedDBStorageController';
 import InstallationController from './InstallationController';
 import * as ParseOp from './ParseOp';
 import RESTController from './RESTController';
@@ -183,6 +184,10 @@ const Parse: ParseType = {
 
     Parse.LiveQuery = new LiveQuery();
     CoreManager.setIfNeeded('LiveQuery', Parse.LiveQuery);
+
+    if (process.env.PARSE_BUILD === 'browser') {
+      Parse.IndexedDB = CoreManager.setIfNeeded('IndexedDBStorageController', IndexedDBStorageController);
+    }
   },
 
   /**
@@ -428,10 +433,6 @@ const Parse: ParseType = {
   },
 };
 
-if (process.env.PARSE_BUILD === 'browser') {
-  Parse.IndexedDB = require('./IndexedDBStorageController');
-}
-
 CoreManager.setCryptoController(CryptoController);
 CoreManager.setInstallationController(InstallationController);
 CoreManager.setRESTController(RESTController);

src/Parse.ts

@@ -237,6 +237,7 @@ describe('Parse module', () => {
       expect(Parse.IndexedDB).toBeUndefined();
       process.env.PARSE_BUILD = 'browser';
       const ParseInstance = require('../Parse');
+      ParseInstance.initialize('test', 'test');
       expect(ParseInstance.IndexedDB).toBeDefined();
       CoreManager.setStorageController(ParseInstance.IndexedDB);
       const currentStorage = CoreManager.getStorageController();

src/__tests__/Parse-test.js

@@ -12,6 +12,7 @@ global.indexedDB = mockIndexedDB;
 jest.mock('idb-keyval', () => {
   return mockIndexedDB;
 });
+const idbKeyVal = require('idb-keyval');
 
 const BrowserStorageController = require('../StorageController.browser');
 
@@ -204,6 +205,17 @@ describe('IndexDB StorageController', () => {
     expect(dbController).toBeUndefined();
     global.indexedDB = mockIndexedDB;
   });
+
+  it('handle indexedDB is not accessible', async () => {
+    jest.isolateModules(() => {
+      global.indexedDB = mockIndexedDB;
+      jest.spyOn(idbKeyVal, 'createStore')
+        .mockImplementationOnce(() => { throw new Error('Protected'); });
+      const dbController = require('../IndexedDBStorageController');
+      expect(dbController).toBeUndefined();
+      expect(idbKeyVal.createStore).toHaveBeenCalled();
+    });
+  });
 });
 
 const DefaultStorageController = require('../StorageController.default');