From 2fed92653f114479af14c76c7ccbeb78a10393b6 Mon Sep 17 00:00:00 2001 From: Axel Date: Thu, 25 May 2023 15:55:46 +0200 Subject: [PATCH] Fixing bug --- app/Http/Controllers/UploadController.php | 2 +- app/Http/Resources/BundleResource.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php index 3ae0843..543b833 100644 --- a/app/Http/Controllers/UploadController.php +++ b/app/Http/Controllers/UploadController.php @@ -18,7 +18,7 @@ class UploadController extends Controller { public function createBundle(Request $request, Bundle $bundle) { return view('upload', [ - 'bundle' => $bundle->toArray(), + 'bundle' => new BundleResource($bundle), 'baseUrl' => config('app.url') ]); } diff --git a/app/Http/Resources/BundleResource.php b/app/Http/Resources/BundleResource.php index 24b8356..49644bb 100644 --- a/app/Http/Resources/BundleResource.php +++ b/app/Http/Resources/BundleResource.php @@ -2,6 +2,8 @@ namespace App\Http\Resources; +use App\Helpers\Auth; +use App\Helpers\Upload; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Support\Facades\Route; @@ -22,11 +24,8 @@ class BundleResource extends JsonResource Do not return private data on the preview page */ $full = false; - $middleware = Route::current()->gatherMiddleware('access.guest'); - foreach ($middleware as $m) { - if ($m === 'access.owner') { - $full = true; - } + if (Auth::isLogged() || Upload::canUpload($request->ip())) { + $full = true; } $response = [