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

updated collectionService to handle keys in base64 format

Browse source
This commit is contained in:
Abhinav-grd 2021-01-19 10:02:12 +05:30
parent 6dee89bb62
commit 52ef03555e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/services/collectionService.ts
View file

@ -65,9 +65,9 @@ const getCollectionKey = async (collection: collection, masterKey: string) => {
masterKey
);
decryptedKey = await worker.boxSealOpen(
await worker.fromB64(collection.encryptedKey),
await worker.fromB64(keyAttributes.publicKey),
await worker.fromB64(secretKey)
await collection.encryptedKey,
await keyAttributes.publicKey,
await secretKey
);
}
return {
@ -123,7 +123,7 @@ export const AddCollection = async (albumName: string, type: CollectionType) =>
const worker = await new CryptoWorker();
const encryptionKey = await getActualKey();
const token = getToken();
const collectionKey: Uint8Array = await worker.generateMasterKey();
const collectionKey: string = await worker.generateMasterKey();
const { encryptedData: encryptedKey, nonce: keyDecryptionNonce }: keyEncryptionResult = await worker.encryptToB64(collectionKey, encryptionKey);
const newCollection: collection = {
id: null,
@ -157,14 +157,13 @@ export const addToFavorites = async (file: file) => {
}
const addtoCollection = async (collection: collection, files: file[]) => {
console.log(collection, files);
const params = new Object();
const worker = await new CryptoWorker();
const token = getToken();
params["collectionID"] = collection.id;
const newFiles: file[] = await Promise.all(files.map(async file => {
file.collectionID = Number(collection.id);
const newEncryptedKey: keyEncryptionResult = await worker.encryptToB64(await worker.fromB64(file.key), collection.key);
const newEncryptedKey: keyEncryptionResult = await worker.encryptToB64(file.key, collection.key);
file.encryptedKey = newEncryptedKey.encryptedData;
file.keyDecryptionNonce = newEncryptedKey.nonce;
if (params["files"] == undefined) {