diff --git a/web/apps/cast/src/services/render.ts b/web/apps/cast/src/services/render.ts index 1e654ebfbc..b19e41bfe1 100644 --- a/web/apps/cast/src/services/render.ts +++ b/web/apps/cast/src/services/render.ts @@ -214,22 +214,22 @@ 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( } 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