IBX-8088: Do not prepend siteaccess to URL if default

ibexa · Apr 9, 2024 · f8e939b · f8e939b
1 parent 82540f6
commit f8e939b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/bundle/Core/Resources/config/routing.yml b/src/bundle/Core/Resources/config/routing.yml
@@ -34,6 +34,7 @@ services:
             - [setRequestContext, ["@router.request_context"]]
             - [setSiteAccess, ['@?Ibexa\Core\MVC\Symfony\SiteAccess']]
             - [setSiteAccessRouter, ['@Ibexa\Core\MVC\Symfony\SiteAccess\Router']]
+            - [setDefaultSiteAccessName, ['%ibexa.site_access.default%']]
             - [setLogger, ["@?logger"]]
 
     Ibexa\Bundle\Core\Routing\UrlAliasRouter:

diff --git a/src/lib/MVC/Symfony/Routing/Generator.php b/src/lib/MVC/Symfony/Routing/Generator.php
@@ -30,6 +30,8 @@ abstract class Generator implements SiteAccessAware
     /** @var \Psr\Log\LoggerInterface */
     protected $logger;
 
+    protected string $defaultSiteAccessName;
+
     /**
      * @param \Symfony\Component\Routing\RequestContext $requestContext
      */
@@ -54,6 +56,11 @@ public function setSiteAccess(SiteAccess $siteAccess = null)
         $this->siteAccess = $siteAccess;
     }
 
+    public function setDefaultSiteAccessName(string $name): void
+    {
+        $this->defaultSiteAccessName = $name;
+    }
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      */
@@ -92,7 +99,7 @@ public function generate($urlResource, array $parameters, $referenceType = UrlGe
         $url = $this->doGenerate($urlResource, $parameters);
 
         // Add the SiteAccess URI back if needed.
-        if ($siteAccess && $siteAccess->matcher instanceof SiteAccess\URILexer) {
+        if ($siteAccess && $siteAccess->matcher instanceof SiteAccess\URILexer && $siteAccess->name !== $this->defaultSiteAccessName) {
             $url = $siteAccess->matcher->analyseLink($url);
         }