FFWEB-2690: fix problem with new map due to SecurityExtension

Author: Rayn93

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
 ## Unreleased
+### Fix
 - SSR
   - Cache field roles
+- fix problem with new map due to SecurityExtension
 
 ## [v4.2.2] - 2023.03.16
 ### Add

spec/Subscriber/ConfigurationSubscriberSpec.php

@@ -22,12 +22,14 @@
 use Shopware\Storefront\Event\StorefrontRenderEvent;
 use Shopware\Storefront\Page\GenericPageLoadedEvent;
 use Shopware\Storefront\Page\Page;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\RouterInterface;
 
 class ConfigurationSubscriberSpec extends ObjectBehavior
 {
     public function let(
+        ParameterBagInterface $params,
         Communication $communication,
         ExtensionConfig $extensionConfig,
         RouterInterface $router
@@ -43,7 +45,7 @@ public function let(
             ]
         );
         $extensionConfig->getRedirectMapping()->willReturn(new RedirectMapping(''));
-        $this->beConstructedWith($communication, $extensionConfig, $router, $fieldRoles, $communicationParameters);
+        $this->beConstructedWith($params, $communication, $extensionConfig, $router, $fieldRoles, $communicationParameters);
     }
 
     public function it_will_return_factfinderchannel_for_specific_sales_channel_id(

src/Resources/views/storefront/base.html.twig

@@ -2,10 +2,17 @@
 
 {% block base_body_inner %}
   {% block base_body_inner_factfinder_communication %}
-    <ff-communication
-      {{ page.extensions.factfinder.communication|default([])|filter(val => val)|map((val, key) => key ~ '="' ~ (val|e('html_attr')) ~ '"')|join(' ')|raw }}
-      only-search-params="true"
-      disable-single-hit-redirect="true"></ff-communication>
+    {% if page.extensions.factfinder.shopwareVersion < 64200 %}
+      <ff-communication
+        {{ page.extensions.factfinder.communication|default([])|filter(val => val)|map((val, key) => key ~ '="' ~ (val|e('html_attr')) ~ '"')|join(' ')|raw }}
+        only-search-params="true"
+        disable-single-hit-redirect="true"></ff-communication>
+    {% else %}
+      <ff-communication
+        {{ page.extensions.factfinder.communication|default([])|filter(val => val)|map((val) => val, (val, key) => key ~ '="' ~ (val|e('html_attr')) ~ '"')|join(' ')|raw }}
+        only-search-params="true"
+        disable-single-hit-redirect="true"></ff-communication>
+    {% endif %}
   {% endblock %}
 
   {{ parent() }}

src/Subscriber/ConfigurationSubscriber.php

@@ -12,6 +12,7 @@
 use Shopware\Core\Framework\Struct\Struct;
 use Shopware\Storefront\Event\StorefrontRenderEvent;
 use Shopware\Storefront\Page\GenericPageLoadedEvent;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RouterInterface;
@@ -23,8 +24,10 @@ class ConfigurationSubscriber implements EventSubscriberInterface
     private array $fieldRoles;
     private array $communicationParameters;
     private array $addParams;
+    private ParameterBagInterface $params;
 
     public function __construct(
+        ParameterBagInterface $params,
         Communication $config,
         ExtensionConfig $extensionConfig,
         RouterInterface $router,
@@ -38,6 +41,7 @@ public function __construct(
         $this->fieldRoles              = $fieldRoles;
         $this->communicationParameters = $communicationParameters;
         $this->addParams               = $configurationAddParams;
+        $this->params                  = $params;
     }
 
     public static function getSubscribedEvents()
@@ -80,6 +84,7 @@ public function onPageLoaded(ShopwareSalesChannelEvent $event): void
                 'searchImmediate'  => $this->isSearchImmediate($event) ? 'true' : 'false',
                 'userId'           => $customer ? $customer->getId() : null,
                 'ssr'              => $this->config->isSsrActive(),
+                'shopwareVersion'  => $this->getShopwareVersion(),
             ]));
         }
     }
@@ -135,4 +140,11 @@ private function getServerUrl(): string
 
         return $this->config->getServerUrl();
     }
+
+    private function getShopwareVersion(): int
+    {
+        $version = str_replace('.', '', $this->params->get('kernel.shopware_version'));
+
+        return (int) $version;
+    }
 }