diff --git a/config/filesystems.php b/config/filesystems.php index 1c6f9e9..bf99557 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('FILESYSTEM_DISK', 'local'), + 'default' => env('FILESYSTEM_DISK', 'private'), /* |-------------------------------------------------------------------------- diff --git a/routes/web.php b/routes/web.php index a759d85..c1bb1d2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -3,21 +3,29 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Session; +use Illuminate\Support\Facades\Storage; use Spatie\MediaLibrary\MediaCollections\Models\Media; Route::redirect('/', '/association/profile'); Route::get('dl/{media}', function (Media $media, Request $request) { - return response()->download($media->getPath(), $media->name); + return Storage::disk($media->disk)->download( + $media->getPathRelativeToRoot(), + $media->file_name + ); }) ->name('dl') ->middleware('signed'); Route::get('media/{media}', function (Media $media, Request $request) { - return response()->file($media->getPath(), [ - 'Content-Type' => $media->mime_type, - 'Cache-Control' => 'private, max-age=3600', - ]); + return Storage::disk($media->disk)->response( + $media->getPathRelativeToRoot(), + $media->file_name, + [ + 'Content-Type' => $media->mime_type, + 'Cache-Control' => 'private, max-age=3600', + ] + ); }) ->name('media.signed') ->middleware('signed');