Store file drop as array instead of object

Signed-off-by: Louis Chemineau <[email protected]>
nextcloud · Aug 31, 2023 · b714fde · b714fde
1 parent 6c118a5
commit b714fde
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/js/end_to_end_encryption-filedrop.js b/js/end_to_end_encryption-filedrop.js
diff --git a/js/end_to_end_encryption-filedrop.js.map b/js/end_to_end_encryption-filedrop.js.map
diff --git a/lib/Controller/MetaDataController.php b/lib/Controller/MetaDataController.php
@@ -239,7 +239,7 @@ public function addMetadataFileDrop(int $id, string $fileDrop, ?string $shareTok
 		try {
 			$metaData = $this->metaDataStorage->getMetaData($ownerId, $id);
 			$decodedMetadata = json_decode($metaData, true);
-			$decodedFileDrop = json_decode($fileDrop, true);
+			$decodedFileDrop = json_decode($fileDrop);
 			$decodedMetadata['filedrop'] = array_merge($decodedMetadata['filedrop'] ?? [], $decodedFileDrop);
 			$encodedMetadata = json_encode($decodedMetadata);
 

diff --git a/lib/Controller/V1/MetaDataController.php b/lib/Controller/V1/MetaDataController.php
@@ -201,8 +201,8 @@ public function addMetadataFileDrop(int $id, string $fileDrop, ?string $shareTok
 
 		try {
 			$metaData = $this->metaDataStorage->getMetaData($ownerId, $id);
-			$decodedMetadata = json_decode($metaData, true);
-			$decodedFileDrop = json_decode($fileDrop, true);
+			$decodedMetadata = json_decode($metaData);
+			$decodedFileDrop = json_decode($fileDrop);
 			$decodedMetadata['filedrop'] = array_merge($decodedMetadata['filedrop'] ?? [], $decodedFileDrop);
 			$encodedMetadata = json_encode($decodedMetadata);
 

diff --git a/src/services/filedrop.js b/src/services/filedrop.js
@@ -20,6 +20,9 @@ import { EncryptedFile, encryptStringAsymmetric, encryptWithAES, getRandomAESKey
  * @property {string} encryptedTag - Encryption tag used to decrypt the 'encrypted' property.
  */
 
+/**
+ *
+ */
 async function getRandomEncryptionParams() {
 	return {
 		key: await getRandomAESKey(),
@@ -39,7 +42,7 @@ function bufferToBase64(buffer) {
  * @param {EncryptedFile} file
  * @param {Uint8Array} tag
  * @param {string} publicKey
- * @return {Promise<Object<string, EncryptedFileMetadata>>}
+ * @return {Promise<EncryptedFileMetadata>}
  */
 export async function getFileDropEntry(file, tag, publicKey) {
 	const rawFileEncryptionKey = await window.crypto.subtle.exportKey('raw', await file.getEncryptionKey())
@@ -70,14 +73,12 @@ export async function getFileDropEntry(file, tag, publicKey) {
 	)
 
 	return {
-		[file.encryptedFileName]: {
-			encrypted: bufferToBase64(encrypted.content),
-			initializationVector: bufferToBase64(file.initializationVector),
-			authenticationTag: bufferToBase64(tag),
-			encryptedKey: bufferToBase64(encryptedKey),
-			encryptedTag: bufferToBase64(encrypted.tag),
-			encryptedInitializationVector: bufferToBase64(encryptedEncryptionParams.initializationVector),
-		},
+		encrypted: bufferToBase64(encrypted.content),
+		initializationVector: bufferToBase64(file.initializationVector),
+		authenticationTag: bufferToBase64(tag),
+		encryptedKey: bufferToBase64(encryptedKey),
+		encryptedTag: bufferToBase64(encrypted.tag),
+		encryptedInitializationVector: bufferToBase64(encryptedEncryptionParams.initializationVector),
 	}
 }
 

diff --git a/src/views/FileDrop.vue b/src/views/FileDrop.vue
@@ -181,7 +181,7 @@ export default {
 
 				const fileDrops = progresses
 					.filter(({ error }) => !error)
-					.reduce((fileDropEntries, { fileDrop }) => ({ ...fileDropEntries, ...fileDrop }), {})
+					.map(({ fileDrop }) => fileDrop)
 
 				await uploadFileDrop(this.encryptionVersion, this.folderId, fileDrops, lockToken, this.shareToken)
 			} catch (exception) {