Fix user hash tag being applied to main response when using Sf Proxy (#…

…64)

* Fix user hash tag being applied to main response when using Symfony Proxy

* CS

* Update UserContextSubscriber.php

src/EventSubscriber/UserContextSubscriber.php

@@ -8,19 +8,18 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use FOS\HttpCache\Handler\TagHandler;
 
 /**
  * Tag /_fos_user_context_hash responses, so we can expire/clear it by tag.
  */
 class UserContextSubscriber implements EventSubscriberInterface
 {
-    /** @var \FOS\HttpCache\Handler\TagHandler */
-    private $tagHandler;
+    /** @var string */
+    private $tagHeader = 'xkey';
 
-    public function __construct(TagHandler $tagHandler)
+    public function __construct($tagHeader)
     {
-        $this->tagHandler = $tagHandler;
+        $this->tagHeader = $tagHeader;
     }
 
     public static function getSubscribedEvents()
@@ -48,9 +47,8 @@ public function tagUserContext(FilterResponseEvent $event)
             return;
         }
 
-        // Improvement potential (mainly relevant if we plan to increase hash ttl notably):
-        // - Get user id to also add tag by id, so user (un)assign don't need to clear all hashes
-        // - If done in layer generating this, we could also tag role id so changes to roles only expire affected hashes
-        $this->tagHandler->addTags(['ez-user-context-hash']);
+        // We need to set tag directly on repsonse here to make sure this does not also get applied to the main request
+        // when using Symfony Proxy, as tag handler does not clear tags between requests.
+        $response->headers->set($this->tagHeader, 'ez-user-context-hash');
     }
 }

src/Resources/config/view_cache.yml

@@ -22,7 +22,7 @@ services:
 
     ezplatform.user_context_tagger.response_subscriber:
         class: EzSystems\PlatformHttpCacheBundle\EventSubscriber\UserContextSubscriber
-        arguments: ['@fos_http_cache.handler.tag_handler']
+        arguments: ['%ezplatform.http_cache.tags.header%']
         tags:
             - { name: kernel.event_subscriber }