add mime types to documents

Resources/public/module/async_upload/downloader.js

@@ -1,3 +1,5 @@
+var mime = require('mime-types');
+
 var algo = 'AES-CBC';
 
 var initializeButtons = (root) => {
@@ -16,52 +18,73 @@ var initialize = (button) => {
 var onClick = e => download(e.target);
 
 var download = (button) => {
-    console.log(button.dataset.key);
     var
         keyData = JSON.parse(button.dataset.key),
-        //keyData, // = JSON.parse(keyString),
         ivData = JSON.parse(button.dataset.iv),
         iv = new Uint8Array(ivData),
-        url = button.dataset.tempUrlGet,
-        data, key
+        urlGenerator = button.dataset.tempUrlGetGenerator,
+        hasFilename = 'filename' in button.dataset,
+        filename = button.dataset.filename,
+        labelPreparing = button.dataset.labelPreparing,
+        labelReady = button.dataset.labelReady,
+        mimeType = button.dataset.mimeType,
+        extension = mime.extension(mimeType),
+        key, url
         ;
-    console.log('keyData', keyData);
-    console.log('iv', iv);
-    console.log('url', url);
     
-    window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt'])
-            .then(nKey => {
-                key = nKey;
-                console.log(key);
-        
-                return window.fetch(url);
-            })
-            .then(r => {
-                if (r.ok) {
-                    return r.arrayBuffer();
-                } else {
-                    console.log(r);
-                    throw new Error(r.statusCode);
+    button.textContent = labelPreparing;
+    
+    window.fetch(urlGenerator)
+        .then((r) => {
+            if (r.ok) {
+                return r.json();
+            } else {
+                throw new Error("error while downloading url " + r.status + " " + r.statusText);
+            }
+        })
+        .then(data => {
+            url = data.url;
+
+            return window.crypto.subtle.importKey('jwk', keyData, { name: algo, iv: iv}, false, ['decrypt']);
+        })
+        .then(nKey => {
+            key = nKey;
+
+            return window.fetch(url);
+        })
+        .then(r => {
+            if (r.ok) {
+                return r.arrayBuffer();
+            } else {
+                throw new Error(r.status + r.statusText);
+            }
+        })
+        .then(buffer => {
+            return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
+        })
+        .then(decrypted => {
+            var 
+                blob = new Blob([decrypted], { type: mimeType }),
+                url = window.URL.createObjectURL(blob)
+                ;
+            button.href = url;
+            button.target = '_parent';
+            button.type = mimeType;
+            button.textContent = labelReady;
+            if (hasFilename) {
+                button.download = filename;
+                if (extension !== false) {
+                    button.download = button.download + '.' + extension;
                 }
-            })
-            .then(buffer => {
-                return window.crypto.subtle.decrypt({ name: algo, iv: iv }, key, buffer);
-            })
-            .then(decrypted => {
-                var 
-                    blob = new Blob([decrypted]),
-                    url = window.URL.createObjectURL(blob)
-                    ;
-                button.href = url;
-                button.removeEventListener('click', onClick);
-            })
-            .catch(error => {
-                console.log(error);
-            })
-            ;
+            }
+            button.removeEventListener('click', onClick);
+        })
+        .catch(error => {
+            console.log(error);
+        })
+        ;
 };
 
 window.addEventListener('load', function(e) {
-    console.log('load');
     initializeButtons(e.target);
 });