Added additional error handling for key generation / encryption actions

Author: cvs0

src/utils/encryption.ts

@@ -1,22 +1,24 @@
-import CryptoJS from "crypto-js";
-
-
 export const generateAndStoreKey = async (userId: string) => {
-  const key = await crypto.subtle.generateKey(
-    {
-      name: "AES-GCM",
-      length: 256,
-    },
-    true,
-    ["encrypt", "decrypt"]
-  );
-
-  const exportedKey = await crypto.subtle.exportKey("raw", key);
-  const keyString = btoa(String.fromCharCode(...new Uint8Array(exportedKey)));
+  try {
+    const key = await crypto.subtle.generateKey(
+      {
+        name: "AES-GCM",
+        length: 256,
+      },
+      true,
+      ["encrypt", "decrypt"]
+    );
+
+    const exportedKey = await crypto.subtle.exportKey("raw", key);
+    const keyString = btoa(String.fromCharCode(...new Uint8Array(exportedKey)));
 
   localStorage.setItem(`encryptionKey-${userId}`, keyString);
 
-  return key;
+    return key;
+  } catch (error) {
+    console.error('Key generation failed:', error);
+    throw new Error('Failed to generate encryption key');
+  }
 };
 
 export const retrieveKey = async (userId: string) => {
@@ -35,6 +37,10 @@ export const retrieveKey = async (userId: string) => {
 
 
 export const encrypt = async (data: string, userId: string) => {
+  if (!data || !userId) {
+    throw new Error('Data and userId are required');
+  }
+
   const key = await retrieveKey(userId);
   const encoder = new TextEncoder();
   const encodedData = encoder.encode(data);
@@ -61,20 +67,25 @@ export const decrypt = async (
   iv: string,
   userId: string
 ): Promise<string> => {
-  const key = await retrieveKey(userId);
-  const decoder = new TextDecoder();
-
-  const encryptedBuffer = Uint8Array.from(atob(encryptedData), (char) => char.charCodeAt(0));
-  const ivBuffer = Uint8Array.from(atob(iv), (char) => char.charCodeAt(0));
-
-  const decryptedBuffer = await crypto.subtle.decrypt(
-    {
-      name: "AES-GCM",
-      iv: ivBuffer,
-    },
-    key,
-    encryptedBuffer
-  );
-
-  return decoder.decode(decryptedBuffer);
+  try {
+    const key = await retrieveKey(userId);
+    const decoder = new TextDecoder();
+
+    const encryptedBuffer = Uint8Array.from(atob(encryptedData), (char) => char.charCodeAt(0));
+    const ivBuffer = Uint8Array.from(atob(iv), (char) => char.charCodeAt(0));
+
+    const decryptedBuffer = await crypto.subtle.decrypt(
+      {
+        name: "AES-GCM",
+        iv: ivBuffer,
+      },
+      key,
+      encryptedBuffer
+    );
+
+    return decoder.decode(decryptedBuffer);
+  } catch (error) {
+    console.error('Decryption failed:', error);
+    throw new Error('Failed to decrypt data');
+  }
 };