Use current request to fetch content for canonical url handler

netgen · Dec 8, 2023 · 76734af · 76734af
1 parent 948714c
commit 76734af
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/bundle/Handler/Literal/CanonicalUrl.php b/bundle/Handler/Literal/CanonicalUrl.php
@@ -7,24 +7,40 @@
 use Ibexa\Core\MVC\Symfony\Routing\UrlAliasRouter;
 use Netgen\Bundle\OpenGraphBundle\Handler\HandlerInterface;
 use Netgen\Bundle\OpenGraphBundle\MetaTag\Item;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\RouterInterface;
+use Netgen\IbexaSiteApi\API\Values\Content as SiteApiContent;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content as IbexaContent;
 
 final class CanonicalUrl implements HandlerInterface
 {
-    private RouterInterface $router;
+    private RequestStack $requestStack;
 
-    public function __construct(RouterInterface $router)
+    private UrlGeneratorInterface $urlGenerator;
+
+    public function __construct(RequestStack $requestStack, UrlGeneratorInterface $urlGenerator)
     {
-        $this->router = $router;
+        $this->requestStack = $requestStack;
+        $this->urlGenerator = $urlGenerator;
     }
 
     public function getMetaTags($tagName, array $params = []): array
     {
-        $value = $this->router->generate(
+        $currentRequest = $this->requestStack->getCurrentRequest();
+        if (!$currentRequest instanceof Request) {
+            return [];
+        }
+
+        $content = $currentRequest->attributes->get('content');
+        if (!$content instanceof IbexaContent && !$content instanceof SiteApiContent) {
+            return [];
+        }
+
+        $value = $this->urlGenerator->generate(
             UrlAliasRouter::URL_ALIAS_ROUTE_NAME,
             [
-                'locationId' => $this->content->contentInfo->mainLocationId,
+                'locationId' => $content->contentInfo->mainLocationId,
             ],
             UrlGeneratorInterface::ABSOLUTE_URL,
         );

diff --git a/bundle/Resources/config/handlers.yaml b/bundle/Resources/config/handlers.yaml
@@ -25,6 +25,7 @@ services:
     netgen_open_graph.handler.literal.canonical_url:
         class: Netgen\Bundle\OpenGraphBundle\Handler\Literal\CanonicalUrl
         arguments:
+            - "@request_stack"
             - "@router"
         tags:
             - { name: netgen_open_graph.meta_tag_handler, alias: literal/canonical_url }