Fixes #16000 - add S3 support for eula PDF downloads

Signed-off-by: snipe <snipe@snipe.net>
snipe · Jan 17, 2025 · 434068a · 434068a
1 parent 7e65d68
commit 434068a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php
@@ -40,10 +40,13 @@ public function displaySig($filename) : RedirectResponse | Response | bool
     public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
     {
         $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
+
+        if (config('filesystems.default') == 's3_private') {
+            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
+        }
 
         if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
-            return response()->download($file);
+            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
         }
 
         return redirect()->back()->with('error',  trans('general.file_does_not_exist'));