From a7515d366c64629cdf2432d2c159a6ff4ca9f765 Mon Sep 17 00:00:00 2001
From: jedi <git@m.j3d1.de>
Date: Wed, 1 Nov 2023 03:17:25 +0100
Subject: [PATCH] stash

---
 frontend/src/components/AuthenticatedImage.vue | 12 ++++--------
 frontend/src/views/InventoryDetail.vue         |  7 +------
 frontend/vite.config.js                        |  6 +++---
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/AuthenticatedImage.vue b/frontend/src/components/AuthenticatedImage.vue
index 84e08b9..b7ac6c9 100644
--- a/frontend/src/components/AuthenticatedImage.vue
+++ b/frontend/src/components/AuthenticatedImage.vue
@@ -1,11 +1,5 @@
 <template>
-    <div>
-        <!--img src=""-->
-        data:{{ image_data }}<br>
-        owner:{{ owner }}<br>
-        src:{{ src }}<br>
-        servers:{{ servers }}
-    </div>
+    <img :src="image_data" :alt="owner + '/' + src"/>
 </template>
 
 <style scoped>
@@ -46,7 +40,9 @@ export default {
     async mounted() {
         try {
             this.servers = await this.getFriendServers({username: this.owner});
-            this.image_data = await this.servers.get(this.signAuth, this.src);
+            const response = await this.servers.getRaw(this.signAuth, this.src);
+            const mime_type = response.headers.get("content-type");
+            this.image_data = "data:" + mime_type + ";base64," + btoa(String.fromCharCode(...new Uint8Array(await response.arrayBuffer())));
         } catch (e) {
             console.log(e);
         }
diff --git a/frontend/src/views/InventoryDetail.vue b/frontend/src/views/InventoryDetail.vue
index 3bfd9fa..1de5a83 100644
--- a/frontend/src/views/InventoryDetail.vue
+++ b/frontend/src/views/InventoryDetail.vue
@@ -34,14 +34,9 @@
                             </div-->
                             <div class="mb-3">
                                 <label for="image" class="form-label">Image</label>
-                                <div>
-                                    <img v-for="file in files" :key="file.id" :alt="file.name"
-                                         :src="'https://toolshed.j3d1.de'+file.name" class="img-thumbnail border-info">
-                                    <!-- TODO  replace dirty hack with proper solution -->
-                                </div>
                                 <div>
                                     <authenticated-image v-for="file in files" :key="file.id" :src="file.name"
-                                                         :owner="file.owner"></authenticated-image>
+                                                         :owner="file.owner" class="img-thumbnail border-info"></authenticated-image>
                                 </div>
 
                             </div>
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index ce6d940..004d372 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -22,8 +22,8 @@ export default defineConfig({
             'Content-Security-Policy': 'default-src \'self\';'
                 + ' script-src \'self\' \'wasm-unsafe-eval\';'
                 + ' style-src \'self\' \'unsafe-inline\';'
-                + ' img-src \'self\' data:; '
-                + ' connect-src * data:', // TODO: change * to https://* for production (probably in nginx config not here)
+                + ' img-src \'self\' https://* data:;'
+                + ' connect-src * data:', // TODO: change * to https://* for production
         },
         /*https: {
             key: fs.readFileSync('privkey.pem'),
@@ -52,7 +52,7 @@ export default defineConfig({
             '^/livereload/': {
                 target: "http://127.0.0.1:8080/",
             }
-        },
+        }
     },
     test: {
         include: ['src/tests/**/*.js'],