Skip to content
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

Fix issue #8 (setItem throws JSON Parse error) #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
19 changes: 16 additions & 3 deletions src/storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@ export const getAsync = async (key, secureStoreOptions) => {
const storageFileUri = await fixedStorageUri(secureStoreOptions);
if (storageFileUri) {
const storageString = await FileSystem.readAsStringAsync(storageFileUri);
const storage = JSON.parse(storageString);

let storage = {};
if (storageString) {
storage = JSON.parse(storageString);
}

const encryptedValue = storage[key];
value = AES.decrypt(encryptedValue, aesKey);
}
Expand All @@ -44,7 +49,10 @@ export const setAsync = async (key, value, secureStoreOptions) => {
const currentStorageFileUri = await fixedStorageUri(secureStoreOptions);
if (currentStorageFileUri) {
const storageString = await FileSystem.readAsStringAsync(currentStorageFileUri);
storage = JSON.parse(storageString);

if (storageString) {
storage = JSON.parse(storageString);
}
}

const { encryptionKey, encryptedData } = AES.encryptWithRandomKey(value);
Expand Down Expand Up @@ -72,7 +80,12 @@ export const removeAsync = async (key, secureStoreOptions) => {
const currentStorageFileUri = await fixedStorageUri(secureStoreOptions);
if (currentStorageFileUri) {
let storageString = await FileSystem.readAsStringAsync(currentStorageFileUri);
storage = JSON.parse(storageString);

let storage = {};
if (storageString) {
storage = JSON.parse(storageString);
}

delete storage.key;
storageString = JSON.stringify(storage);

Expand Down