From a57f3b8c2fd91f37c58f8f2df5c3fd2281d61a37 Mon Sep 17 00:00:00 2001
From: Ruslan Bayandinov <45530296+wazsone@users.noreply.github.com>
Date: Fri, 12 May 2023 10:24:42 +0400
Subject: [PATCH] fix missing attached filenames (#3172)

Signed-off-by: Ruslan Bayandinov <wazsone@ya.ru>
---
 packages/presentation/src/components/PDFViewer.svelte |  6 +++---
 packages/presentation/src/utils.ts                    |  8 +++++---
 server/front/src/index.ts                             | 11 ++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte
index a793158be9..e95080468b 100644
--- a/packages/presentation/src/components/PDFViewer.svelte
+++ b/packages/presentation/src/components/PDFViewer.svelte
@@ -61,7 +61,7 @@
   </svelte:fragment>
 
   <svelte:fragment slot="utils">
-    <a class="no-line" href={getFileUrl(file)} download={name} bind:this={download}>
+    <a class="no-line" href={getFileUrl(file, 'full', name)} download={name} bind:this={download}>
       <Button
         icon={Download}
         kind={'transparent'}
@@ -75,14 +75,14 @@
 
   {#if contentType && contentType.startsWith('image/')}
     <div class="pdfviewer-content img" style:margin={$deviceInfo.minWidth ? '.5rem' : '1.5rem'}>
-      <img class="img-fit" src={getFileUrl(file)} alt="" />
+      <img class="img-fit" src={getFileUrl(file, 'full', name)} alt="" />
     </div>
     <div class="space" />
   {:else}
     <iframe
       class="pdfviewer-content"
       style:margin={$deviceInfo.minWidth ? '.5rem' : '1.5rem'}
-      src={getFileUrl(file) + '#view=FitH&navpanes=0'}
+      src={getFileUrl(file, 'full', name) + '#view=FitH&navpanes=0'}
       title=""
     />
   {/if}
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index 09d3e03d2f..fda0a16c89 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -260,14 +260,16 @@ export function createQuery (dontDestroy?: boolean): LiveQuery {
 /**
  * @public
  */
-export function getFileUrl (file: string, size: IconSize = 'full'): string {
+export function getFileUrl (file: string, size: IconSize = 'full', filename?: string): string {
   if (file.includes('://')) {
     return file
   }
   const uploadUrl = getMetadata(plugin.metadata.UploadURL)
   const token = getMetadata(plugin.metadata.Token)
-  const url = `${uploadUrl as string}?file=${file}&token=${token as string}&size=${size as string}`
-  return url
+  if (filename !== undefined) {
+    return `${uploadUrl as string}/${filename}?file=${file}&token=${token as string}&size=${size as string}`
+  }
+  return `${uploadUrl as string}?file=${file}&token=${token as string}&size=${size as string}`
 }
 
 /**
diff --git a/server/front/src/index.ts b/server/front/src/index.ts
index c09909f493..984a09bd7a 100644
--- a/server/front/src/index.ts
+++ b/server/front/src/index.ts
@@ -216,8 +216,7 @@ export function start (
     }
   })
 
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-  app.get('/files', async (req, res: Response) => {
+  const filesHandler = async (req: any, res: Response): Promise<void> => {
     try {
       const token = req.query.token as string
       const payload = decodeToken(token)
@@ -236,7 +235,13 @@ export function start (
       console.log(error)
       res.status(500).send()
     }
-  })
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  app.get('/files/', filesHandler)
+
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  app.get('/files/*', filesHandler)
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   app.post('/files', async (req, res) => {