Explorar o código

Merge branch 'feature/V8-7432-finaliser-la-page-licence-cmf' into release/2.6

Olivier Massot hai 4 meses
pai
achega
3c656cf635
Modificáronse 2 ficheiros con 7 adicións e 7 borrados
  1. 4 6
      composables/utils/useDownloadFile.ts
  2. 3 1
      middleware/routing.global.ts

+ 4 - 6
composables/utils/useDownloadFile.ts

@@ -5,17 +5,15 @@ import type File from '~/models/Core/File'
 export const useDownloadFile = async (file: File) => {
   const { apiRequestService } = useAp2iRequestService()
 
-  const downloadUrl = `api/download/${file.id}`
+  const downloadUrl = `api/file/download/${file.id}`
 
-  const response = await apiRequestService.get(downloadUrl)
+  const response = (await apiRequestService.get(downloadUrl)) as unknown as Blob
 
-  const blobPart = await response.blob()
-
-  if (!response || blobPart.size === 0) {
+  if (!response || response.size === 0) {
     console.error('Error: file ' + file.id + ' not found')
   }
 
-  const blob = new Blob([blobPart], { type: response.type })
+  const blob = new Blob([response], { type: response.type })
 
   FileSaver.saveAs(blob, file.name ?? 'unknown')
 }

+ 3 - 1
middleware/routing.global.ts

@@ -16,10 +16,12 @@ export default defineNuxtRouteMiddleware((to, _) => {
     const name: string = routeName?.toString() ?? ''
 
     // <<- TODO: remove after 2.6 release
+    const inDevPages = []
+
     const runtimeConfig = useRuntimeConfig()
     if (
       runtimeConfig.public.env === 'production' &&
-      name === 'cmf_licence_page'
+      inDevPages.includes(name)
     ) {
       const { redirectToHome } = useRedirect()
       redirectToHome()