Merge pull request #827 from ente-io/fix-normal-upload
fix non-public collection upload
This commit is contained in:
commit
8cb5344d7b
|
@ -111,15 +111,20 @@ export async function encryptFile(
|
||||||
const { file: encryptedMetadata }: EncryptionResult =
|
const { file: encryptedMetadata }: EncryptionResult =
|
||||||
await worker.encryptMetadata(file.metadata, fileKey);
|
await worker.encryptMetadata(file.metadata, fileKey);
|
||||||
|
|
||||||
const { file: encryptedPubMagicMetadataData }: EncryptionResult =
|
let encryptedPubMagicMetadata: EncryptedMagicMetadataCore;
|
||||||
await worker.encryptMetadata(file.pubMagicMetadata.data, fileKey);
|
if (file.pubMagicMetadata) {
|
||||||
|
const { file: encryptedPubMagicMetadataData }: EncryptionResult =
|
||||||
const encryptedPubMagicMetadata: EncryptedMagicMetadataCore = {
|
await worker.encryptMetadata(
|
||||||
version: file.pubMagicMetadata.version,
|
file.pubMagicMetadata.data,
|
||||||
count: file.pubMagicMetadata.count,
|
fileKey
|
||||||
data: encryptedPubMagicMetadataData.encryptedData as unknown as string,
|
);
|
||||||
header: encryptedPubMagicMetadataData.decryptionHeader,
|
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(
|
const encryptedKey: B64EncryptionResult = await worker.encryptToB64(
|
||||||
fileKey,
|
fileKey,
|
||||||
|
|
Loading…
Reference in a new issue