Fix issue #8 (setItem throws JSON Parse error)

dannyklaassen · Sep 29, 2022 · d54e674 · d54e674
1 parent 730d393
commit d54e674
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/storage.js b/src/storage.js
@@ -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);
                 }
@@ -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);
@@ -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);