fix: localStorage check

airgap-it · Oct 24, 2023 · f26d7ae · f26d7ae
1 parent 4017f26
commit f26d7ae
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 17 deletions.
diff --git a/packages/beacon-core/src/index.ts b/packages/beacon-core/src/index.ts
@@ -40,6 +40,7 @@ import { getLogger, Logger, setLogger } from './utils/Logger'
 import { windowRef } from './MockWindow'
 import { CommunicationClient } from './transports/clients/CommunicationClient'
 import { ClientEvents } from './transports/clients/ClientEvents'
+import { isLocalStorageAvailable } from './utils/storage-utils'
 // import { EncryptionType } from './types/EncryptionType'
 // import { EncryptionOperation } from './types/EncryptionOperation'
 
@@ -67,7 +68,7 @@ export {
 export { Transport, MessageBasedClient, CommunicationClient }
 
 // Storage
-export { ChromeStorage, LocalStorage, getStorage }
+export { ChromeStorage, LocalStorage, getStorage, isLocalStorageAvailable }
 
 // Managers
 export { PeerManager, AccountManager, AppMetadataManager, PermissionManager }

diff --git a/packages/beacon-core/src/utils/storage-utils.ts b/packages/beacon-core/src/utils/storage-utils.ts
@@ -0,0 +1,10 @@
+export const isLocalStorageAvailable = () => {
+  var test = 'test'
+  try {
+    localStorage.setItem(test, test)
+    localStorage.removeItem(test)
+    return true
+  } catch (e) {
+    return false
+  }
+}
diff --git a/packages/beacon-dapp/src/dapp-client/DAppClient.ts b/packages/beacon-dapp/src/dapp-client/DAppClient.ts
@@ -75,6 +75,7 @@ import {
   AppMetadataManager,
   Serializer,
   LocalStorage,
+  isLocalStorageAvailable,
   getAccountIdentifier,
   getSenderId,
   Logger,
@@ -435,9 +436,8 @@ export class DAppClient extends Client {
   }
 
   private async resetWCSnapshot() {
-    if (!localStorage) {
+    if (!isLocalStorageAvailable()) {
       return
-
     }
     const storage = new LocalStorage()
 
@@ -1644,13 +1644,15 @@ export class DAppClient extends Client {
     logger.log('makeRequest', 'after init')
 
     const transport = await this.transport
-    const regexp = new RegExp(/^(\[\])$/)
-    const pairingMissing = regexp.test(
-      (await this.storage.get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]'
-    )
-    const sessionMissing = regexp.test(
-      (await this.storage.get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]'
-    )
+
+    let pairingMissing,
+      sessionMissing = false
+
+    if (isLocalStorageAvailable()) {
+      const storage = new LocalStorage()
+      pairingMissing = ((await storage.get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]') === '[]'
+      sessionMissing = ((await storage.get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]') === '[]'
+    }
 
     if (
       requestInput.type === BeaconMessageType.PermissionRequest &&
@@ -1780,13 +1782,15 @@ export class DAppClient extends Client {
     }
 
     const transport = await this.transport
-    const regexp = new RegExp(/^(\[\])$/)
-    const pairingMissing = regexp.test(
-      (await this.storage.get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]'
-    )
-    const sessionMissing = regexp.test(
-      (await this.storage.get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]'
-    )
+
+    let pairingMissing,
+      sessionMissing = false
+
+    if (isLocalStorageAvailable()) {
+      const storage = new LocalStorage()
+      pairingMissing = ((await storage.get(StorageKey.WC_2_CORE_PAIRING)) ?? '[]') === '[]'
+      sessionMissing = ((await storage.get(StorageKey.WC_2_CLIENT_SESSION)) ?? '[]') === '[]'
+    }
 
     if (
       requestInput.type === BeaconMessageType.PermissionRequest &&