OP-149 Add filtering to URLs where wishlist should be created

features/assigning_wishlist_to_user.feature

@@ -12,7 +12,7 @@ Feature: Assigning a wishlist to a user
 
   @ui
   Scenario: Listing wishlists
-    When I go to "/"
+    When I go to "/wishlist"
     And I log in as "[email protected]"
     And I go to "/wishlists"
     Then I should have 2 wishlists
@@ -22,7 +22,7 @@ Feature: Assigning a wishlist to a user
     Given the store has a product "Jack Daniels Gentleman" priced at "$10.00"
     And all store products appear under a main taxonomy
     And I add this product to wishlist
-    When I go to "/"
+    When I go to "/wishlist"
     And I log in as "[email protected]"
     And I go to "/wishlists"
     And I follow "Save wishlist"
@@ -31,7 +31,7 @@ Feature: Assigning a wishlist to a user
 
   @ui @javascript
   Scenario: Assigning a wishlist to a user and logout
-    When I go to "/"
+    When I go to "/wishlist"
     And I log in as "[email protected]"
     And I go to "/wishlists"
     And I press "wishlist-edit-button-Wishlist1"
@@ -48,6 +48,7 @@ Feature: Assigning a wishlist to a user
     And all store products appear under a main taxonomy
     And I add this product to wishlist
     When I go to "/"
+    When I go to "/wishlist"
     And I log in as "[email protected]"
     And I go to "/wishlists"
     And I press "wishlist-edit-button-Wishlist"

features/listing_wishlists.feature

@@ -9,7 +9,7 @@ Feature: Listing wishlists
 
     @ui
     Scenario: Listing wishlist
-        Given I am on "/"
+        Given I am on "/wishlist"
         And the store has a wishlist named "Wishlist1"
         And the store has a wishlist named "Wishlist2"
         When I go to "/wishlists"

features/removing_wishlist.feature

@@ -6,7 +6,7 @@ Feature: Removing a wishlist
 
     Background:
         Given the store operates on a single channel in "United States"
-        Given I am on "/"
+        Given I am on "/wishlist"
 
     @ui @javascript
     Scenario: Removing a wishlist

features/showing_chosen_wishlist.feature

@@ -6,7 +6,7 @@ Feature: Showing chosen wishlist
 
     Background:
         Given the store operates on a single channel in "United States"
-        Given I am on "/"
+        Given I am on "/wishlist"
 
     @ui
     Scenario: Showing chosen wishlist

src/EventSubscriber/CreateNewWishlistSubscriber.php

@@ -23,6 +23,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
@@ -47,6 +48,8 @@ final class CreateNewWishlistSubscriber implements EventSubscriberInterface
 
     private TokenUserResolverInterface $tokenUserResolver;
 
+    private RequestStack $requestStack;
+
     public function __construct(
         string $wishlistCookieToken,
         WishlistsResolverInterface $wishlistsResolver,
@@ -56,6 +59,7 @@ public function __construct(
         ChannelContextInterface $channelContext,
         WishlistCookieTokenResolverInterface $wishlistCookieTokenResolver,
         TokenUserResolverInterface $tokenUserResolver,
+        RequestStack $requestStack,
     ) {
         $this->wishlistCookieToken = $wishlistCookieToken;
         $this->wishlistsResolver = $wishlistsResolver;
@@ -65,6 +69,7 @@ public function __construct(
         $this->channelContext = $channelContext;
         $this->wishlistCookieTokenResolver = $wishlistCookieTokenResolver;
         $this->tokenUserResolver = $tokenUserResolver;
+        $this->requestStack = $requestStack;
     }
 
     public static function getSubscribedEvents(): array
@@ -77,18 +82,21 @@ public static function getSubscribedEvents(): array
 
     public function onKernelRequest(RequestEvent $event): void
     {
-        if (!$event->isMainRequest()) {
+        $request = $this->requestStack->getMainRequest();
+        $currentPath = $request->getPathInfo();
+
+        if (!$event->isMainRequest() || !str_starts_with($currentPath, '/wishlist')) {
             return;
         }
 
         /** @var WishlistInterface[] $wishlists */
         $wishlists = $this->wishlistsResolver->resolve();
 
-        $wishlistCookieToken = $event->getRequest()->cookies->get($this->wishlistCookieToken);
+        $wishlistCookieToken = $request->cookies->get($this->wishlistCookieToken);
 
         if (!empty($wishlists)) {
             if (null === $wishlistCookieToken) {
-                $event->getRequest()->attributes->set($this->wishlistCookieToken, reset($wishlists)->getToken());
+                $request->attributes->set($this->wishlistCookieToken, reset($wishlists)->getToken());
             }
 
             return;
@@ -99,28 +107,29 @@ public function onKernelRequest(RequestEvent $event): void
             $wishlistCookieToken = $this->wishlistCookieTokenResolver->resolve();
         }
 
-        $event->getRequest()->attributes->set($this->wishlistCookieToken, $wishlistCookieToken);
+        $request->attributes->set($this->wishlistCookieToken, $wishlistCookieToken);
     }
 
     public function onKernelResponse(ResponseEvent $event): void
     {
-        if (!$event->isMainRequest()) {
+        $request = $this->requestStack->getMainRequest();
+        $currentPath = $request->getPathInfo();
+        if (!$event->isMainRequest() || !str_starts_with($currentPath, '/wishlist')) {
             return;
         }
-
-        if ($event->getRequest()->cookies->has($this->wishlistCookieToken)) {
+        if ($request->cookies->has($this->wishlistCookieToken)) {
             return;
         }
 
         $response = $event->getResponse();
-        $wishlistCookieToken = $event->getRequest()->attributes->get($this->wishlistCookieToken);
+        $wishlistCookieToken = $request->attributes->get($this->wishlistCookieToken);
 
         if (!$wishlistCookieToken) {
             return;
         }
         $this->setWishlistCookieToken($response, $wishlistCookieToken);
 
-        $event->getRequest()->attributes->remove($this->wishlistCookieToken);
+        $request->attributes->remove($this->wishlistCookieToken);
     }
 
     private function createNewWishlist(?string $wishlistCookieToken): WishlistInterface

src/Resolver/WishlistCookieTokenResolver.php

@@ -20,6 +20,8 @@ final class WishlistCookieTokenResolver implements WishlistCookieTokenResolverIn
 
     private string $wishlistCookieToken;
 
+    private ?string $generatedToken = null;
+
     public function __construct(
         RequestStack $requestStack,
         string $wishlistCookieToken
@@ -30,12 +32,25 @@ public function __construct(
 
     public function resolve(): string
     {
+        if (null !== $this->generatedToken) {
+            return $this->generatedToken;
+        }
+
         $wishlistCookieToken = $this->requestStack->getMainRequest()->cookies->get($this->wishlistCookieToken);
 
         if (!$wishlistCookieToken) {
-            return (string) new WishlistToken();
+            if ($this->requestStack->getMainRequest()->attributes->get($this->wishlistCookieToken)) {
+                return $this->requestStack->getMainRequest()->attributes->get($this->wishlistCookieToken);
+            }
+
+            $newToken = (string) new WishlistToken();
+            $this->generatedToken = $newToken;
+
+            return $newToken;
         }
 
+        $this->generatedToken = $wishlistCookieToken;
+
         return $wishlistCookieToken;
     }
 }

src/Resources/config/services.yml

@@ -207,6 +207,7 @@ services:
             - "@sylius.context.channel"
             - '@bitbag_sylius_wishlist_plugin.resolver.wishlist_cookie_token_resolver'
             - '@bitbag_sylius_wishlist_plugin.resolver.token_user_resolver'
+            - '@request_stack'
         tags:
             - { name: kernel.event_subscriber, event: kernel.exception }