[Spec] added new test to work with long api routes

SirDomin · SirDomin · commit 2d8a25752a2f · 2021-01-21T10:43:17.000+01:00
diff --git a/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml
@@ -7,5 +7,5 @@ fos_rest:
         empty_content: 204
     format_listener:
         rules:
-            - { path: '^/api/v2/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
+            - { path: '^/api/v1/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
             - { path: '^/', stop: true }
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -1,7 +1,7 @@
 parameters:
     sylius.security.admin_regex: "^/%sylius_admin.path_name%"
     sylius.security.api_regex: "^/api/v1"
-    sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|api/v2/.*|api$|media/.*)[^/]++"
+    sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|api/.*|api$|media/.*)[^/]++"
     sylius.security.new_api_route: "/api/v2"
     sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
     sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"
diff --git a/src/Sylius/Bundle/ApiBundle/Provider/PathPrefixProvider.php b/src/Sylius/Bundle/ApiBundle/Provider/PathPrefixProvider.php
@@ -35,17 +35,17 @@ public function __construct(UserContextInterface $userContext, string $apiRoute)
 
     public function getPathPrefix(string $path): ?string
     {
-        $pathElements = array_values(array_filter(explode('/', $path)));
-
-        if ('/' . $pathElements[0] !== $this->apiRoute) {
+        if (!str_contains($path, $this->apiRoute)) {
             return null;
         }
 
-        if ($pathElements[1] === PathPrefixes::SHOP_PREFIX) {
+        $pathElements = array_values(array_filter(explode('/', str_replace($this->apiRoute, '', $path))));
+
+        if ($pathElements[0] === PathPrefixes::SHOP_PREFIX) {
             return PathPrefixes::SHOP_PREFIX;
         }
 
-        if ($pathElements[1] === PathPrefixes::ADMIN_PREFIX) {
+        if ($pathElements[0] === PathPrefixes::ADMIN_PREFIX) {
             return PathPrefixes::ADMIN_PREFIX;
         }
 
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Provider/PathPrefixProviderSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Provider/PathPrefixProviderSpec.php
@@ -23,7 +23,7 @@ final class PathPrefixProviderSpec extends ObjectBehavior
 {
     function let(UserContextInterface $userContext): void
     {
-        $this->beConstructedWith($userContext, '/api/v2/');
+        $this->beConstructedWith($userContext, '/api/v2');
     }
 
     function it_implements_a_path_prefix_provider_interface(): void
@@ -51,6 +51,12 @@ function it_returns_admin_prefix_based_on_the_given_path(): void
         $this->getPathPrefix('/api/v2/admin/certain-route')->shouldReturn('admin');
     }
 
+    function it_returns_prefix_from_api_route_with_slashes(UserContextInterface $userContext): void
+    {
+        $this->beConstructedWith($userContext, '/api/long/route/name');
+        $this->getPathPrefix('/api/long/route/name/admin/certain-route')->shouldReturn('admin');
+    }
+
     function it_returns_admin_prefix_if_currently_logged_in_is_admin_user(
         UserContextInterface $userContext,
         AdminUserInterface $user

Original file line number	Diff line number	Diff line change
`@@ -35,17 +35,17 @@ public function __construct(UserContextInterface $userContext, string $apiRoute)`
`35`	`35`
`36`	`36`	`public function getPathPrefix(string $path): ?string`
`37`	`37`	`{`
`38`		`- $pathElements = array_values(array_filter(explode('/', $path)));`
`39`		`-`
`40`		`- if ('/' . $pathElements[0] !== $this->apiRoute) {`
	`38`	`+ if (!str_contains($path, $this->apiRoute)) {`
`41`	`39`	`return null;`
`42`	`40`	`}`
`43`	`41`
`44`		`- if ($pathElements[1] === PathPrefixes::SHOP_PREFIX) {`
	`42`	`+ $pathElements = array_values(array_filter(explode('/', str_replace($this->apiRoute, '', $path))));`
	`43`	`+`
	`44`	`+ if ($pathElements[0] === PathPrefixes::SHOP_PREFIX) {`
`45`	`45`	`return PathPrefixes::SHOP_PREFIX;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if ($pathElements[1] === PathPrefixes::ADMIN_PREFIX) {`
	`48`	`+ if ($pathElements[0] === PathPrefixes::ADMIN_PREFIX) {`
`49`	`49`	`return PathPrefixes::ADMIN_PREFIX;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ final class PathPrefixProviderSpec extends ObjectBehavior`
`23`	`23`	`{`
`24`	`24`	`function let(UserContextInterface $userContext): void`
`25`	`25`	`{`
`26`		`- $this->beConstructedWith($userContext, '/api/v2/');`
	`26`	`+ $this->beConstructedWith($userContext, '/api/v2');`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`function it_implements_a_path_prefix_provider_interface(): void`
`@@ -51,6 +51,12 @@ function it_returns_admin_prefix_based_on_the_given_path(): void`
`51`	`51`	`$this->getPathPrefix('/api/v2/admin/certain-route')->shouldReturn('admin');`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ function it_returns_prefix_from_api_route_with_slashes(UserContextInterface $userContext): void`
	`55`	`+ {`
	`56`	`+ $this->beConstructedWith($userContext, '/api/long/route/name');`
	`57`	`+ $this->getPathPrefix('/api/long/route/name/admin/certain-route')->shouldReturn('admin');`
	`58`	`+ }`
	`59`	`+`
`54`	`60`	`function it_returns_admin_prefix_if_currently_logged_in_is_admin_user(`
`55`	`61`	`UserContextInterface $userContext,`
`56`	`62`	`AdminUserInterface $user`