From 6501a0148e9fa4ccdc48a3b7ef87ddef42debab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Dec 2021 22:14:13 +0100
Subject: [PATCH] fix downloading document

---
 .../public/module/async_upload/downloader.js  | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
index b8abcae62..4c82a8e4b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/downloader.js
@@ -34,9 +34,6 @@ var download = (button) => {
         key, url
         ;
 
-    console.log('keyData', keyData);
-    console.log('ivData', ivData);
-
     button.textContent = labelPreparing;
 
     window.fetch(urlGenerator)
@@ -48,36 +45,25 @@ var download = (button) => {
             }
         })
         .then(data => {
-            url = data.url;
-
-            if (keyData.length > 0) {
-                return window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt']);
-            }
-            return Promise.resolve(undefined);
+            return window.fetch(data.url);
         })
-        .then(nKey => {
-            key = nKey;
-
-            return window.fetch(url);
-        })
-        .then(r => {
-            console.log('r', r);
-            if (r.ok) {
-                return r.arrayBuffer();
-            } else {
-                throw new Error(r.status + r.statusText);
+        .then(response => {
+            if (response.ok) {
+                return response.arrayBuffer();
             }
+            throw new Error(response.status + response.statusText);
         })
         .then(buffer => {
-            console.log('buffer', buffer);
-            if (keyData.length > 0) {
-                return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+            if (keyData.alg !== undefined) {
+                return window.crypto.subtle
+                    .importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt'])
+                    .then(key => {
+                        return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+                    });
             }
-
             return Promise.resolve(buffer);
         })
         .then(decrypted => {
-            console.log('decrypted', decrypted);
             var
                 blob = new Blob([decrypted], { type: mimeType }),
                 url = window.URL.createObjectURL(blob)
@@ -96,7 +82,6 @@ var download = (button) => {
             button.click();
         })
         .catch(error => {
-            console.log(error);
             button.textContent = "";
             button.appendChild(document.createTextNode("error while handling decrypted file"));
         })