TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the no longer needed indirection

Browse Source
This commit is contained in:
Manav Rathi
2024-08-10 19:54:11 +05:30
parent 8acc5ac62d
commit b8830144be
2 changed files with 11 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
web/packages/media/file-metadata.ts
View File

@@ -1,4 +1,4 @@
import { encryptMetadata, type decryptMetadata } from "@/base/crypto/ente";
import { decryptMetadataJSON, encryptMetadataJSON } from "@/base/crypto/ente";
import { authenticatedRequestHeaders, ensureOk } from "@/base/http";
import { apiURL } from "@/base/origins";
import { type EnteFile } from "@/new/photos/types/file";
@@ -270,26 +270,6 @@ const PublicMagicMetadata = z
})
.passthrough();
/**
* A function that can be used to encrypt the contents of a metadata field
* associated with a file.
*
* This is parameterized to allow us to use either the regular
* {@link encryptMetadata} (if we're already running in a web worker) or its web
* worker wrapper (if we're running on the main thread).
*/
export type EncryptMetadataF = typeof encryptMetadata;
/**
* A function that can be used to decrypt the contents of a metadata field
* associated with a file.
*
* This is parameterized to allow us to use either the regular
* {@link encryptMetadata} (if we're already running in a web worker) or its web
* worker wrapper (if we're running on the main thread).
*/
export type DecryptMetadataF = typeof decryptMetadata;
/**
* Return the public magic metadata for the given {@link enteFile}.
*
@@ -302,7 +282,6 @@ export type DecryptMetadataF = typeof decryptMetadata;
*/
export const decryptPublicMagicMetadata = async (
enteFile: EnteFile,
decryptMetadataF: DecryptMetadataF,
): Promise<PublicMagicMetadata | undefined> => {
const envelope = enteFile.pubMagicMetadata;
// TODO: The underlying types need auditing.
@@ -317,11 +296,11 @@ export const decryptPublicMagicMetadata = async (
const jsonValue =
typeof envelope.data == "string"
? await decryptMetadataF(
envelope.data,
envelope.header,
enteFile.key,
)
? await decryptMetadataJSON({
encryptedDataB64: envelope.data,
decryptionHeaderB64: envelope.header,
keyB64: enteFile.key,
})
: envelope.data;
const result = PublicMagicMetadata.parse(
// TODO: Can we avoid this cast?
@@ -377,23 +356,12 @@ export const getUICreationDate = (
*
* @param metadataUpdates A subset of {@link PublicMagicMetadata} containing the
* fields that we want to add or update.
*
* @param encryptMetadataF A function that is used to encrypt the updated
* metadata.
*
* @param decryptMetadataF A function that is used to decrypt the existing
* metadata.
*/
export const updateRemotePublicMagicMetadata = async (
enteFile: EnteFile,
metadataUpdates: Partial<PublicMagicMetadata>,
encryptMetadataF: EncryptMetadataF,
decryptMetadataF: DecryptMetadataF,
) => {
const existingMetadata = await decryptPublicMagicMetadata(
enteFile,
decryptMetadataF,
);
const existingMetadata = await decryptPublicMagicMetadata(enteFile);
const updatedMetadata = { ...(existingMetadata ?? {}), ...metadataUpdates };
@@ -405,7 +373,6 @@ export const updateRemotePublicMagicMetadata = async (
enteFile,
updatedMetadata,
metadataVersion,
encryptMetadataF,
);
const updatedEnvelope = ensure(updateRequest.metadataList[0]).magicMetadata;
@@ -420,7 +387,7 @@ export const updateRemotePublicMagicMetadata = async (
// response of the /diff. Temporarily bump it for the in place edits.
enteFile.pubMagicMetadata.version = enteFile.pubMagicMetadata.version + 1;
// Re-read the data.
await decryptPublicMagicMetadata(enteFile, decryptMetadataF);
await decryptPublicMagicMetadata(enteFile);
// Re-jig the other bits of EnteFile that depend on its public magic
// metadata.
mergeMetadata1(enteFile);
@@ -492,7 +459,6 @@ const updateMagicMetadataRequest = async (
enteFile: EnteFile,
metadata: PrivateMagicMetadata | PublicMagicMetadata,
metadataVersion: number,
encryptMetadataF: EncryptMetadataF,
): Promise<UpdateMagicMetadataRequest> => {
// Drop all null or undefined values to obtain the syncable entries.
// See: [Note: Optional magic metadata keys].
@@ -500,9 +466,8 @@ const updateMagicMetadataRequest = async (
([, v]) => v !== null && v !== undefined,
);
const { encryptedDataB64, decryptionHeaderB64 } = await encryptMetadataF(
Object.fromEntries(validEntries),
enteFile.key,
const { encryptedDataB64, decryptionHeaderB64 } = await encryptMetadataJSON(
{ jsonValue: Object.fromEntries(validEntries), keyB64: enteFile.key },
);
return {

17
web/packages/shared/file-metadata.ts
View File

@@ -1,5 +1,3 @@
import { decryptMetadata } from "@/base/crypto/ente";
import { sharedCryptoWorker } from "@/base/crypto/worker";
import { isDevBuild } from "@/base/env";
import {
decryptPublicMagicMetadata,
@@ -8,19 +6,6 @@ import {
import { EnteFile } from "@/new/photos/types/file";
import { fileLogID } from "@/new/photos/utils/file";
/**
* On-demand decrypt the public magic metadata for an {@link EnteFile} for code
* running on the main thread.
*
* It both modifies the given file object, and also returns the decrypted
* metadata.
*/
export const getPublicMagicMetadataMT = async (enteFile: EnteFile) =>
decryptPublicMagicMetadata(
enteFile,
(await sharedCryptoWorker()).decryptMetadata,
);
/**
* On-demand decrypt the public magic metadata for an {@link EnteFile} for code
* running on the main thread, but do it synchronously.
@@ -40,7 +25,7 @@ export const getPublicMagicMetadataMTSync = (enteFile: EnteFile) => {
throw new Error(
`Public magic metadata for ${fileLogID(enteFile)} had not been decrypted even when the file reached the UI layer`,
);
decryptPublicMagicMetadata(enteFile, decryptMetadata);
decryptPublicMagicMetadata(enteFile);
}
// This cast is unavoidable in the current setup. We need to refactor the
// types so that this cast in not needed.