Skip to content

fix: Error in web context when window.indexedDB API is available but protected #2039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 25 additions & 20 deletions src/IndexedDBStorageController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions src/Parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
}
},

/**
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/Parse-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 12 additions & 0 deletions src/__tests__/Storage-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ global.indexedDB = mockIndexedDB;
jest.mock('idb-keyval', () => {
return mockIndexedDB;
});
const idbKeyVal = require('idb-keyval');

const BrowserStorageController = require('../StorageController.browser');

Expand Down Expand Up @@ -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');
Expand Down