Redirect to homepage when global filter is invalid

Author: dvlpp

src/Filters/GlobalFilters/GlobalFilters.php

@@ -54,10 +54,6 @@ public function toArray(): array
 
     public function findFilter(string $key): ?Filter
     {
-        return collect($this->getFilters())
-            ->firstWhere(fn (GlobalRequiredFilter $filter) => class_exists($key)
-                ? $filter instanceof $key
-                : $filter->getKey() === $key
-            );
+        return $this->filterContainer()->findFilterHandler($key);
     }
 }

src/Http/Middleware/HandleGlobalFilters.php

@@ -29,6 +29,12 @@ public function handle(Request $request, Closure $next)
                     ->each(fn (GlobalRequiredFilter $globalFilter, int $index) => $globalFilter
                         ->setCurrentValue($filterKeys[$index])
                     );
+
+                if (sharp()->context()->globalFilterUrlSegmentValue() !== $filterKey) {
+                    return redirect()->route('code16.sharp.home', [
+                        'filterKey' => sharp()->context()->globalFilterUrlSegmentValue(),
+                    ]);
+                }
             }
         }
 

tests/Http/GlobalFilterControllerTest.php

@@ -37,7 +37,7 @@ public function defaultValue(): mixed
 
     $this
         ->followingRedirects()
-        ->post(route('code16.sharp.filters.update', ['test']), ['filterValues' => ['test' => '1']])
+        ->post(route('code16.sharp.filters.update', ['2']), ['filterValues' => ['test' => '1']])
         ->assertOk();
 
     $this->assertEquals('1', sharp()->context()->globalFilterValue('test'));
@@ -46,7 +46,7 @@ public function defaultValue(): mixed
 it('sets to global filter to the default value if missing', function () {
     $this
         ->followingRedirects()
-        ->post(route('code16.sharp.filters.update', ['test']), ['filterValues' => []])
+        ->post(route('code16.sharp.filters.update', ['2']), ['filterValues' => []])
         ->assertOk();
 
     $this->assertEquals(2, sharp()->context()->globalFilterValue('test'));
@@ -55,7 +55,7 @@ public function defaultValue(): mixed
 it('does not allow to set a global filter to an unexpected value', function () {
     $this
         ->followingRedirects()
-        ->post(route('code16.sharp.filters.update', ['test']), ['filterValues' => ['test' => 4]])
+        ->post(route('code16.sharp.filters.update', ['2']), ['filterValues' => ['test' => 4]])
         ->assertOk();
 
     $this->assertEquals(2, sharp()->context()->globalFilterValue('test'));

tests/Http/GlobalFilterRoutesTest.php

@@ -50,11 +50,11 @@
     expect(sharp()->context()->globalFilterValue('test'))->toEqual('one');
 });
 
-it('wont set an invalid value of the current filterKey according to the URL', function () {
+it('redirects to the homepage if an invalid filterKey is set in the URL', function () {
     fakeGlobalFilter();
 
     $this->get('/sharp/five/s-list/person/s-show/person/1')
-        ->assertOk();
+        ->assertRedirect(route('code16.sharp.home', ['filterKey' => 'two']));
 
     expect(sharp()->context()->globalFilterValue('test'))->toEqual('two');
 });