Fix download controller for large files

Author: aguingand

src/Http/Controllers/Api/DownloadController.php

@@ -25,12 +25,6 @@ public function show(string $globalFilter, string $entityKey, ?string $instanceI
             trans('sharp::errors.file_not_found'),
         );
 
-        return response(
-            content: Storage::disk($disk)->get($path),
-            headers: [
-                'Content-Type' => Storage::disk($disk)->mimeType($path),
-                'Content-Disposition' => 'attachment',
-            ],
-        );
+        return Storage::disk($disk)->download($path);
     }
 }

src/Http/Middleware/HandleSharpErrors.php

@@ -20,8 +20,10 @@ public function handle(Request $request, Closure $next)
         /** @var Response $response */
         $response = $next($request);
 
-        if ($response->exception instanceof ValidationException
-            || $response->exception instanceof AuthenticationException) {
+        if (isset($response->exception) && (
+            $response->exception instanceof ValidationException
+            || $response->exception instanceof AuthenticationException
+        )) {
             return $response;
         }
 

src/Http/Middleware/InvalidateCache.php

@@ -3,15 +3,19 @@
 namespace Code16\Sharp\Http\Middleware;
 
 use Closure;
+use Symfony\Component\HttpFoundation\Response;
 
 class InvalidateCache
 {
     public function handle($request, Closure $next)
     {
+        /** @var Response $response */
         $response = $next($request);
 
-        return $response->header('Pragma', 'no-cache')
-            ->header('Expires', 'Fri, 01 Jan 1990 00:00:00 GMT')
-            ->header('Cache-Control', 'no-cache, must-revalidate, no-store, max-age=0, private');
+        $response->headers->set('Pragma', 'no-cache');
+        $response->headers->set('Expires', 'Fri, 01 Jan 1990 00:00:00 GMT');
+        $response->headers->set('Cache-Control', 'no-cache, must-revalidate, no-store, max-age=0, private');
+
+        return $response;
     }
 }

tests/Http/Api/DownloadControllerTest.php

@@ -15,7 +15,7 @@
     $file = UploadedFile::fake()->image('test.jpg', 600, 600);
     $file->storeAs('/files', 'test.jpg', ['disk' => 'local']);
 
-    $response = $this
+    $this
         ->get(
             route('code16.sharp.download.show', [
                 'entityKey' => 'person',
@@ -24,17 +24,16 @@
                 'path' => '/files/test.jpg',
             ]),
         )
-        ->assertOk();
-
-    expect($response->content())
-        ->toEqual(Storage::disk('local')->get('files/test.jpg'));
+        ->assertOk()
+        ->assertStreamedContent(Storage::disk('local')->get('files/test.jpg'))
+        ->assertHeader('Content-Disposition', 'attachment; filename=test.jpg');
 });
 
 it('allows to download a file from a show field', function () {
     $file = UploadedFile::fake()->image('test.jpg', 600, 600);
     $file->storeAs('/files', 'test.jpg', ['disk' => 'local']);
 
-    $response = $this
+    $this
         ->get(
             route('code16.sharp.download.show', [
                 'entityKey' => 'person',
@@ -43,10 +42,9 @@
                 'path' => '/files/test.jpg',
             ]),
         )
-        ->assertOk();
-
-    expect($response->content())
-        ->toEqual(Storage::disk('local')->get('files/test.jpg'));
+        ->assertOk()
+        ->assertStreamedContent(Storage::disk('local')->get('files/test.jpg'))
+        ->assertHeader('Content-Disposition', 'attachment; filename=test.jpg');
 });
 
 it('returns a 404 for a missing file', function () {
@@ -55,7 +53,7 @@
             route('code16.sharp.download.show', [
                 'entityKey' => 'person',
                 'instanceId' => 1,
-                'fileName' => 'test.jpg',
+                'path' => '/files/unknown.jpg',
             ]),
         )
         ->assertNotFound();