[5.x] Fix taxonomy routes on multi-site (#10398)

Co-authored-by: Jason Varga <jason@pixelfear.com>

Author: aerni

src/Taxonomies/Taxonomy.php

@@ -368,9 +368,17 @@ public function toResponse($request)
             throw new NotFoundHttpException;
         }
 
+        if (! $this->sites()->contains($site = Site::current())) {
+            throw new NotFoundHttpException;
+        }
+
+        if ($this->collection() && ! $this->collection()->sites()->contains($site)) {
+            throw new NotFoundHttpException;
+        }
+
         return (new \Statamic\Http\Responses\DataResponse($this))
             ->with([
-                'terms' => $termQuery = $this->queryTerms()->where('site', Site::current()),
+                'terms' => $termQuery = $this->queryTerms()->where('site', $site),
                 $this->handle() => $termQuery,
             ])
             ->toResponse($request);

tests/Data/Taxonomies/ViewsTest.php

@@ -18,33 +18,47 @@ class ViewsTest extends TestCase
 
     private $blogEntry;
     private $frenchBlogEntry;
+    private $germanBlogEntry;
     private $blogCollection;
+    private $tagsTaxonomy;
 
     public function setUp(): void
     {
         parent::setUp();
 
         $this->setSites([
             'en' => ['url' => '/', 'locale' => 'en'],
+            'de' => ['url' => '/de/', 'locale' => 'de'],
             'fr' => ['url' => '/fr/', 'locale' => 'fr'],
         ]);
 
         $this->withStandardFakeViews();
 
-        Collection::make('pages')->routes('{slug}')->sites(['en', 'fr'])->save();
+        Collection::make('pages')->routes('{slug}')->sites(['en', 'de', 'fr'])->save();
         $this->blogEntry = EntryFactory::collection('pages')->locale('en')->slug('the-blog')->create();
         $this->frenchBlogEntry = EntryFactory::collection('pages')->locale('fr')->slug('le-blog')->origin($this->blogEntry->id())->create();
+        $this->germanBlogEntry = EntryFactory::collection('pages')->locale('de')->slug('der-blog')->origin($this->blogEntry->id())->create();
 
-        $this->blogCollection = tap(Collection::make('blog')->sites(['en', 'fr'])->taxonomies(['tags']))->save();
+        $this->blogCollection = tap(Collection::make('blog')->sites(['en', 'de', 'fr'])->taxonomies(['tags']))->save();
 
-        Taxonomy::make('tags')->sites(['en', 'fr'])->title('Tags')->save();
+        $this->tagsTaxonomy = tap(Taxonomy::make('tags')->sites(['en', 'fr'])->title('Tags'))->save();
 
         tap(Term::make('test')->taxonomy('tags'), function ($term) {
             $term->in('en')->slug('test')->set('title', 'Test');
             $term->in('fr')->slug('le-test')->set('title', 'Le Test');
         })->save();
     }
 
+    #[Test]
+    public function the_taxonomy_url_404s_for_unconfigured_sites()
+    {
+        $this->viewShouldReturnRaw('tags.index', '{{ title }} index');
+
+        $this->get('/tags')->assertOk()->assertSee('Tags index');
+        $this->get('/fr/tags')->assertOk()->assertSee('Tags index');
+        $this->get('/de/tags')->assertNotFound();
+    }
+
     #[Test]
     public function the_taxonomy_url_404s_if_the_view_doesnt_exist()
     {
@@ -81,6 +95,42 @@ public function it_loads_the_localized_term_url_if_the_view_exists()
         $this->get('/fr/tags/le-test')->assertOk()->assertSee('showing Le Test');
     }
 
+    #[Test]
+    public function the_collection_specific_taxonomy_url_404s_for_unconfigured_sites()
+    {
+        $this->mountBlogPageToBlogCollection();
+
+        $this->viewShouldReturnRaw('blog.tags.index', '{{ title }} index');
+
+        $this->get('/the-blog/tags')->assertOk()->assertSee('Tags index');
+        $this->get('/fr/le-blog/tags')->assertOk()->assertSee('Tags index');
+        $this->get('/de/der-blog/tags')->assertNotFound();
+    }
+
+    #[Test]
+    public function the_collection_specific_taxonomy_url_404s_when_collection_is_not_configured_for_that_site()
+    {
+        $this->mountBlogPageToBlogCollection();
+
+        // Set all the slugs to match the taxonomy, to make sure that the
+        // missing localized collection URL isn't the thing causing the 404.
+        $this->blogEntry->in('en')->slug('blog')->save();
+        $this->blogEntry->in('fr')->slug('blog')->save();
+        $this->blogEntry->in('de')->slug('blog')->save();
+        $this->get('/blog')->assertOk();
+        $this->get('/fr/blog')->assertOk();
+        $this->get('/de/blog')->assertOk();
+
+        $this->tagsTaxonomy->sites(['en', 'fr', 'de'])->save();
+        $this->blogCollection->sites(['en', 'de'])->save();
+
+        $this->viewShouldReturnRaw('blog.tags.index', '{{ title }} index');
+
+        $this->get('/blog/tags')->assertOk()->assertSee('Tags index');
+        $this->get('/fr/blog/tags')->assertNotFound();
+        $this->get('/de/blog/tags')->assertOk()->assertSee('Tags index');
+    }
+
     #[Test]
     public function the_collection_specific_taxonomy_url_404s_if_the_view_doesnt_exist()
     {