Merge pull request #134 from Novactive/ezprotectedcontentbundle-fix-admin-modal

#106733 - novactive/ezprotectedcontentbundle - gestion de la protection par mot de passe d'un contenu

Author: erdnaxelaweb

bundle/Controller/Admin/ProtectedAccessController.php

@@ -17,7 +17,7 @@
 use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use eZ\Publish\API\Repository\Values\Content\Location;
-use EzSystems\PlatformHttpCacheBundle\PurgeClient\PurgeClientInterface;
+use Ibexa\Contracts\HttpCache\Handler\ContentTagInterface;
 use Novactive\Bundle\eZProtectedContentBundle\Entity\ProtectedAccess;
 use Novactive\Bundle\eZProtectedContentBundle\Form\ProtectedAccessType;
 use Symfony\Component\Form\FormFactoryInterface;
@@ -38,7 +38,7 @@ public function handle(
         FormFactoryInterface $formFactory,
         EntityManagerInterface $entityManager,
         RouterInterface $router,
-        PurgeClientInterface $httpCachePurgeClient,
+        ContentTagInterface $responseTagger,
         ?ProtectedAccess $access = null
     ): RedirectResponse {
         if ($request->isMethod('post')) {
@@ -54,12 +54,8 @@ public function handle(
                 $access->setUpdated($now);
                 $entityManager->persist($access);
                 $entityManager->flush();
-                $httpCachePurgeClient->purge(
-                    [
-                        'location-'.$location->id,
-                        'location-'.$location->parentLocationId,
-                    ]
-                );
+                $responseTagger->addLocationTags([$location->id]);
+                $responseTagger->addParentLocationTags([$location->parentLocationId]);
             }
         }
 
@@ -78,18 +74,14 @@ public function remove(
         Location $location,
         EntityManagerInterface $entityManager,
         RouterInterface $router,
-        ProtectedAccess $access,
-        PurgeClientInterface $httpCachePurgeClient
+        int $access,
+        ContentTagInterface $responseTagger
     ): RedirectResponse {
+        $access = $entityManager->find(ProtectedAccess::class, $access);
         $entityManager->remove($access);
         $entityManager->flush();
-
-        $httpCachePurgeClient->purge(
-            [
-                'location-'.$location->id,
-                'location-'.$location->parentLocationId,
-            ]
-        );
+        $responseTagger->addLocationTags([$location->id]);
+        $responseTagger->addParentLocationTags([$location->parentLocationId]);
 
         return new RedirectResponse(
             $router->generate('ibexa.content.view', ['contentId' => $location->contentId,

bundle/Resources/config/services.yaml

@@ -6,7 +6,6 @@ services:
         autoconfigure: true
         public: false
         bind:
-            $httpCachePurgeClient: '@ibexa.http_cache.purge_client'
             $entityManager: "@novaezprotectedcontent.doctrine.entity_manager"
 
     Novactive\Bundle\eZProtectedContentBundle\Command\: