handle when crypto key is possibly null

inertiajs · Oct 10, 2024 · adb45a9 · adb45a9
1 parent ee300ef
commit adb45a9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/packages/core/src/encryption.ts b/packages/core/src/encryption.ts
@@ -8,6 +8,11 @@ export const encryptHistory = async (data: any): Promise<ArrayBuffer> => {
   const iv = getIv()
   const storedKey = await getKeyFromSessionStorage()
   const key = await getOrCreateKey(storedKey)
+
+  if (!key) {
+    throw new Error('Unable to encrypt history')
+  }
+
   const encrypted = await encryptData(iv, key, data)
 
   return encrypted
@@ -125,6 +130,10 @@ const getOrCreateKey = async (key: CryptoKey | null) => {
 
   const newKey = await createKey()
 
+  if (!newKey) {
+    return null
+  }
+
   await saveKey(newKey)
 
   return newKey