src/composables/downloadFile.js

@@ -1,24 +1,11 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
-import axios from 'axios';
-import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+    let appUrl = await getUrl('', 'lilium');
-    const response = await axios.get(
+    appUrl = appUrl.replace('/#/', '');
-        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
-        { responseType: 'blob' }
-    );
-
-    const contentDisposition = response.headers['content-disposition'];
-    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-    const filename =
-        matches != null && matches[1]
-            ? matches[1].replace(/['"]/g, '')
-            : 'downloaded-file';
-
-    exportFile(filename, response.data);
 }

test/vitest/__tests__/composables/downloadFile.spec.js

@@ -1,36 +1,25 @@
-import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
+import { vi, describe, expect, it } from 'vitest';
 import { axios } from 'app/test/vitest/helper';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
+
 const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
-    const baseUrl = 'http://localhost:9000';
-    let defaulCreateObjectURL;
-
-    beforeAll(() => {
-        defaulCreateObjectURL = window.URL.createObjectURL;
-        window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
-    });
-
-    afterAll(() => (window.URL.createObjectURL = defaulCreateObjectURL));
-
     it('should open a new window to download the file', async () => {
-        const res = {
+        const url = 'http://localhost:9000';
-            data: new Blob(['file content'], { type: 'application/octet-stream' }),
+
-            headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
+        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: url });
-        };
+
-        vi.spyOn(axios, 'get').mockImplementation((url) => {
+        const mockWindowOpen = vi.spyOn(window, 'open');
-            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
-            else if (url.includes('downloadFile')) return Promise.resolve(res);
-        });
 
         await downloadFile(1);
 
-        expect(axios.get).toHaveBeenCalledWith(
+        expect(mockWindowOpen).toHaveBeenCalledWith(
-            `${baseUrl}/dms/1/downloadFile?access_token=${token}`,
+            `${url}/api/dms/1/downloadFile?access_token=${token}`
-            { responseType: 'blob' }
         );
+
+        mockWindowOpen.mockRestore();
     });
 });