From 26641a45842ac2a2285db749dd4b6af763bb08e4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 10 Sep 2024 09:52:44 +0530
Subject: [PATCH 1/2] [cast] Fix cast continually getting reset

---
 web/apps/cast/src/services/render.ts          | 21 ++++++++++---------
 .../photos/src/utils/magicMetadata/index.ts   | 11 +++++-----
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/web/apps/cast/src/services/render.ts b/web/apps/cast/src/services/render.ts
index 1e654ebfbc..bfb840c5f0 100644
--- a/web/apps/cast/src/services/render.ts
+++ b/web/apps/cast/src/services/render.ts
@@ -214,22 +214,23 @@ const decryptEnteFile = async (
         fileMagicMetadata = {
             ...encryptedFile.magicMetadata,
             // @ts-expect-error TODO: Need to use zod here.
-            data: await worker.decryptMetadata(
-                magicMetadata.data,
-                magicMetadata.header,
-                fileKey,
-            ),
+            data: await worker.decryptMetadataJSON({
+                encryptedDataB64: magicMetadata.data,
+                decryptionHeaderB64: magicMetadata.header,
+                keyB64: fileKey,
+            }),
+
         };
     }
     if (pubMagicMetadata?.data) {
         filePubMagicMetadata = {
             ...pubMagicMetadata,
             // @ts-expect-error TODO: Need to use zod here.
-            data: await worker.decryptMetadata(
-                pubMagicMetadata.data,
-                pubMagicMetadata.header,
-                fileKey,
-            ),
+            data: await worker.decryptMetadataJSON({
+                encryptedDataB64: pubMagicMetadata.data,
+                decryptionHeaderB64: pubMagicMetadata.header,
+                keyB64: fileKey,
+            }),
         };
     }
     return mergeMetadata1({
diff --git a/web/apps/photos/src/utils/magicMetadata/index.ts b/web/apps/photos/src/utils/magicMetadata/index.ts
index f07254b5df..3f2132f82d 100644
--- a/web/apps/photos/src/utils/magicMetadata/index.ts
+++ b/web/apps/photos/src/utils/magicMetadata/index.ts
@@ -53,12 +53,13 @@ export async function updateMagicMetadata<T>(
     }
 
     if (typeof originalMagicMetadata?.data === "string") {
+        // TODO: Is this even used?
         // @ts-expect-error TODO: Need to use zod here.
-        originalMagicMetadata.data = await cryptoWorker.decryptMetadata(
-            originalMagicMetadata.data,
-            originalMagicMetadata.header,
-            decryptionKey,
-        );
+        originalMagicMetadata.data = await cryptoWorker.decryptMetadataJSON({
+            encryptedDataB64: originalMagicMetadata.data,
+            decryptionHeaderB64: originalMagicMetadata.header,
+            keyB64: decryptionKey,
+        });
     }
     // copies the existing magic metadata properties of the files and updates the visibility value
     // The expected behavior while updating magic metadata is to let the existing property as it is and update/add the property you want

From 1b95ce330a1792536a7e2ead5ceeda5e4ee6e9b6 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Tue, 10 Sep 2024 09:58:36 +0530
Subject: [PATCH 2/2] Fix lint

---
 web/apps/cast/src/services/render.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/apps/cast/src/services/render.ts b/web/apps/cast/src/services/render.ts
index bfb840c5f0..b19e41bfe1 100644
--- a/web/apps/cast/src/services/render.ts
+++ b/web/apps/cast/src/services/render.ts
@@ -219,7 +219,6 @@ const decryptEnteFile = async (
                 decryptionHeaderB64: magicMetadata.header,
                 keyB64: fileKey,
             }),
-
         };
     }
     if (pubMagicMetadata?.data) {