Fix ArgumentCountError on the TenantAssetsController (archtechx#894)

* Fix ArgumentCount exception on the TenantAssetsController when no `$path` is provided * CS * CS * Handle null case explicitly * code style Co-authored-by: Bram Wubs <[email protected]> Co-authored-by: Samuel Štancl <[email protected]>
icaliman · Jul 20, 2022 · 747c192 · 747c192
1 parent ba92810
commit 747c192
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/Controllers/TenantAssetsController.php b/src/Controllers/TenantAssetsController.php
@@ -5,6 +5,7 @@
 namespace Stancl\Tenancy\Controllers;
 
 use Illuminate\Routing\Controller;
+use Throwable;
 
 class TenantAssetsController extends Controller
 {
@@ -15,11 +16,13 @@ public function __construct()
         $this->middleware(static::$tenancyMiddleware);
     }
 
-    public function asset($path)
+    public function asset($path = null)
     {
+        abort_if($path === null, 404);
+
         try {
             return response()->file(storage_path("app/public/$path"));
-        } catch (\Throwable $th) {
+        } catch (Throwable $th) {
             abort(404);
         }
     }

diff --git a/tests/TenantAssetTest.php b/tests/TenantAssetTest.php
@@ -126,4 +126,19 @@ public function asset_helper_tenancy_can_be_disabled()
 
         $this->assertSame($original, asset('foo'));
     }
+
+    public function test_asset_controller_returns_a_404_when_no_path_is_provided()
+    {
+        TenantAssetsController::$tenancyMiddleware = InitializeTenancyByRequestData::class;
+
+        $tenant = Tenant::create();
+
+        tenancy()->initialize($tenant);
+        $response = $this->get(tenant_asset(null), [
+            'X-Tenant' => $tenant->id,
+        ]);
+
+        $response->assertNotFound();
+    }
+
 }