From 07b003f7e6f6c29253bf6bb340b67e3b07354af3 Mon Sep 17 00:00:00 2001
From: Irmantas Kaukas <irmastnt@gmail.com>
Date: Tue, 10 Dec 2024 10:58:20 +0100
Subject: [PATCH] fix: file name decoding from response headers (DEV-4401)
 (#1996)

---
 .../src/lib/representation.service.ts         | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/libs/vre/resource-editor/representations/src/lib/representation.service.ts b/libs/vre/resource-editor/representations/src/lib/representation.service.ts
index 723662f77c..6d4720b9f7 100644
--- a/libs/vre/resource-editor/representations/src/lib/representation.service.ts
+++ b/libs/vre/resource-editor/representations/src/lib/representation.service.ts
@@ -88,12 +88,10 @@ export class RepresentationService {
     const ingestFileUrl = this.getIngestFileUrl(attachedProject.shortcode, assetId);
     this.downloadFile(ingestFileUrl, this.userCanView(fileValue));
   }
-
   private downloadFile(url: string, userCanView = true) {
     let headers = {};
     const isLoggedIn = this._store.selectSnapshot(UserSelectors.isLoggedIn);
-    const withCredentials = isLoggedIn && userCanView;
-    if (withCredentials) {
+    if (isLoggedIn && userCanView) {
       const authToken = this._accessTokenService.getAccessToken();
       headers = new HttpHeaders({
         Authorization: `Bearer ${authToken}`,
@@ -109,10 +107,23 @@ export class RepresentationService {
       .pipe(take(1))
       .subscribe((res: HttpResponse<Blob>) => {
         const contentDisposition = res.headers.get('content-disposition');
-        const fileNameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-        const matches = fileNameRegex.exec(contentDisposition || '');
-        const fileName =
-          contentDisposition && matches != null && matches[1] ? matches[1].replace(/['"]/g, '') : url.split('/').pop()!;
+        let fileName: string | null = null;
+        if (contentDisposition) {
+          const fileNameRegex = /filename\*=(?:([a-zA-Z0-9-]+)''([^;'\n]*))|filename=([^;'\n]*)/;
+          const matches = fileNameRegex.exec(contentDisposition);
+          fileName =
+            matches && matches[2]
+              ? decodeURIComponent(matches[2].replace(/\+/g, ' '))
+              : matches && matches[3]
+                ? matches[3].replace(/['"]/g, '').replace(/\+/g, ' ')
+                : null;
+        }
+
+        // Fallback to extracting filename from URL if not found
+        if (!fileName) {
+          fileName = url.split('/').pop()!;
+        }
+
         const a = document.createElement('a');
         a.href = window.URL.createObjectURL(res.body!);
         a.download = fileName;