[ApiBundle] Revert changes in RouteNameResolver and PathPrefixProvider

Sylius · Feb 26, 2021 · f705b37 · f705b37
1 parent f40dba3
commit f705b37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/src/Sylius/Bundle/ApiBundle/ApiPlatform/Bridge/Symfony/Routing/RouteNameResolver.php b/src/Sylius/Bundle/ApiBundle/ApiPlatform/Bridge/Symfony/Routing/RouteNameResolver.php
@@ -89,20 +89,12 @@ private function returnMatchingRouteName(
         }
 
         foreach ($matchingRoutes as $routeName => $route) {
-            $routePrefix = $this->pathPrefixProvider->getPathPrefix($route->getPath());
             $requestPrefix = $this->pathPrefixProvider->getCurrentPrefix();
-
-            if ($requestPrefix === '' && strpos($routeName, '_shop_')) {
-                return $routeName;
-            }
+            $routePrefix = $this->pathPrefixProvider->getPathPrefix($route->getPath());
 
             if ($requestPrefix !== null && $routePrefix !== null && $requestPrefix === $routePrefix) {
                 return $routeName;
             }
-
-            if ($requestPrefix === null) {
-                return $routeName;
-            }
         }
 
         throw new InvalidArgumentException(

diff --git a/src/Sylius/Bundle/ApiBundle/Provider/PathPrefixProvider.php b/src/Sylius/Bundle/ApiBundle/Provider/PathPrefixProvider.php
@@ -57,11 +57,7 @@ public function getCurrentPrefix(): ?string
         /** @var UserInterface|null $user */
         $user = $this->userContext->getUser();
 
-        if ($user === null) {
-            return '';
-        }
-
-        if ($user instanceof ShopUserInterface) {
+        if ($user === null || $user instanceof ShopUserInterface) {
             return PathPrefixes::SHOP_PREFIX;
         }
 

diff --git a/src/Sylius/Bundle/ApiBundle/spec/Provider/PathPrefixProviderSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Provider/PathPrefixProviderSpec.php
@@ -75,10 +75,10 @@ function it_returns_shop_prefix_if_currently_logged_in_is_shop_user(
         $this->getCurrentPrefix()->shouldReturn('shop');
     }
 
-    function it_returns_empty_string_if_there_is_no_logged_in_user(UserContextInterface $userContext): void
+    function it_returns_shop_prefix_if_there_is_no_logged_in_user(UserContextInterface $userContext): void
     {
         $userContext->getUser()->willReturn(null);
 
-        $this->getCurrentPrefix()->shouldReturn('');
+        $this->getCurrentPrefix()->shouldReturn('shop');
     }
 }