beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #827 from ente-io/fix-normal-upload

Browse source 
fix non-public collection upload
This commit is contained in:
Abhinav Kumar 2022-12-16 15:20:00 +05:30 committed by GitHub
parent 5f4df85148 9016b8447a
commit 8cb5344d7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/services/upload/fileService.ts
View file

@ -111,15 +111,20 @@ export async function encryptFile(
const { file: encryptedMetadata }: EncryptionResult =
await worker.encryptMetadata(file.metadata, fileKey);
const { file: encryptedPubMagicMetadataData }: EncryptionResult =
await worker.encryptMetadata(file.pubMagicMetadata.data, fileKey);
const encryptedPubMagicMetadata: EncryptedMagicMetadataCore = {
version: file.pubMagicMetadata.version,
count: file.pubMagicMetadata.count,
data: encryptedPubMagicMetadataData.encryptedData as unknown as string,
header: encryptedPubMagicMetadataData.decryptionHeader,
};
let encryptedPubMagicMetadata: EncryptedMagicMetadataCore;
if (file.pubMagicMetadata) {
const { file: encryptedPubMagicMetadataData }: EncryptionResult =
await worker.encryptMetadata(
file.pubMagicMetadata.data,
fileKey
);
encryptedPubMagicMetadata = {
version: file.pubMagicMetadata.version,
count: file.pubMagicMetadata.count,
data: encryptedPubMagicMetadataData.encryptedData as unknown as string,
header: encryptedPubMagicMetadataData.decryptionHeader,
};
}
const encryptedKey: B64EncryptionResult = await worker.encryptToB64(
fileKey,