This commit is contained in:
Manav Rathi 2024-08-05 14:44:37 +05:30
parent 9583b31bfc
commit f8c12ba127
No known key found for this signature in database
6 changed files with 10 additions and 10 deletions

View File

@ -133,7 +133,7 @@ const getCollectionWithSecrets = async (
if (collection.magicMetadata?.data) {
collectionMagicMetadata = {
...collection.magicMetadata,
data: await cryptoWorker.decryptMetadata2(
data: await cryptoWorker.decryptMetadata(
collection.magicMetadata.data,
collection.magicMetadata.header,
collectionKey,
@ -144,7 +144,7 @@ const getCollectionWithSecrets = async (
if (collection.pubMagicMetadata?.data) {
collectionPublicMagicMetadata = {
...collection.pubMagicMetadata,
data: await cryptoWorker.decryptMetadata2(
data: await cryptoWorker.decryptMetadata(
collection.pubMagicMetadata.data,
collection.pubMagicMetadata.header,
collectionKey,
@ -156,7 +156,7 @@ const getCollectionWithSecrets = async (
if (collection.sharedMagicMetadata?.data) {
collectionShareeMagicMetadata = {
...collection.sharedMagicMetadata,
data: await cryptoWorker.decryptMetadata2(
data: await cryptoWorker.decryptMetadata(
collection.sharedMagicMetadata.data,
collection.sharedMagicMetadata.header,
collectionKey,

View File

@ -153,7 +153,7 @@ const syncEntity = async <T>(type: EntityType): Promise<Entity<T>> => {
}
const { encryptedData, header, ...rest } = entity;
const worker = await ComlinkCryptoWorker.getInstance();
const decryptedData = await worker.decryptMetadata2(
const decryptedData = await worker.decryptMetadata(
encryptedData,
header,
entityKey.data,

View File

@ -329,7 +329,7 @@ export const getPublicCollection = async (
if (fetchedCollection.pubMagicMetadata?.data) {
collectionPublicMagicMetadata = {
...fetchedCollection.pubMagicMetadata,
data: await cryptoWorker.decryptMetadata2(
data: await cryptoWorker.decryptMetadata(
fetchedCollection.pubMagicMetadata.data,
fetchedCollection.pubMagicMetadata.header,
collectionKey,

View File

@ -147,7 +147,7 @@ export async function decryptFile(
keyDecryptionNonce,
collectionKey,
);
const fileMetadata = await worker.decryptMetadata2(
const fileMetadata = await worker.decryptMetadata(
metadata.encryptedData,
metadata.decryptionHeader,
fileKey,
@ -157,7 +157,7 @@ export async function decryptFile(
if (magicMetadata?.data) {
fileMagicMetadata = {
...file.magicMetadata,
data: await worker.decryptMetadata2(
data: await worker.decryptMetadata(
magicMetadata.data,
magicMetadata.header,
fileKey,
@ -167,7 +167,7 @@ export async function decryptFile(
if (pubMagicMetadata?.data) {
filePubMagicMetadata = {
...pubMagicMetadata,
data: await worker.decryptMetadata2(
data: await worker.decryptMetadata(
pubMagicMetadata.data,
pubMagicMetadata.header,
fileKey,

View File

@ -57,7 +57,7 @@ export async function updateMagicMetadata<T>(
if (typeof originalMagicMetadata?.data === "string") {
// @ts-expect-error TODO: Need to use zod here.
originalMagicMetadata.data = await cryptoWorker.decryptMetadata2(
originalMagicMetadata.data = await cryptoWorker.decryptMetadata(
originalMagicMetadata.data,
originalMagicMetadata.header,
decryptionKey,

View File

@ -20,7 +20,7 @@ export class DedicatedCryptoWorker {
return ente.encryptMetadata(metadata, keyB64);
}
async decryptMetadata2(
async decryptMetadata(
encryptedDataB64: string,
decryptionHeaderB64: string,
keyB64: string,