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

corrected the key used for encrypting collection key

Browse source
This commit is contained in:
Abhinav-grd 2021-01-21 11:15:50 +05:30
parent 592172917f
commit e490df7440
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/services/collectionService.ts
View file

@ -59,10 +59,7 @@ const getCollectionSecrets = async (collection: collection, masterKey: string) =
collection.keyDecryptionNonce,
masterKey
);
decryptedName = collection.name || await worker.decryptString(
collection.encryptedName,
collection.nameDecryptionNonce,
masterKey);
} else {
const keyAttributes = getData(LS_KEYS.KEY_ATTRIBUTES);
const secretKey = await worker.decryptB64(
@ -75,11 +72,11 @@ const getCollectionSecrets = async (collection: collection, masterKey: string) =
keyAttributes.publicKey,
secretKey
);
decryptedName = collection.name || await worker.decryptString(
collection.encryptedName,
collection.nameDecryptionNonce,
secretKey);
}
decryptedName = collection.name || await worker.decryptString(
collection.encryptedName,
collection.nameDecryptionNonce,
decryptedKey);
return {
...collection,
key: decryptedKey,
@ -145,7 +142,7 @@ export const AddCollection = async (collectionName: string, type: CollectionType
const token = getToken();
const collectionKey: string = await worker.generateMasterKey();
const { encryptedData: encryptedKey, nonce: keyDecryptionNonce }: keyEncryptionResult = await worker.encryptToB64(collectionKey, encryptionKey);
const { encryptedData: encryptedName, nonce: nameDecryptionNonce }: keyEncryptionResult = await worker.encryptToB64(collectionName, encryptionKey);
const { encryptedData: encryptedName, nonce: nameDecryptionNonce }: keyEncryptionResult = await worker.encryptToB64(collectionName, collectionKey);
const newCollection: collection = {
id: null,
owner: null,