Dont add path to an url we already added a path to.

Author: Nyholm

spec/Plugin/AddPathPluginSpec.php

@@ -41,6 +41,7 @@ function it_adds_path(
 
         $uri->withPath('/api/users')->shouldBeCalled()->willReturn($uri);
         $uri->getPath()->shouldBeCalled()->willReturn('/users');
+        $uri->__toString()->shouldBeCalled()->willReturn('https://example.com/api/users');
 
         $this->beConstructedWith($host);
         $this->handleRequest($request, function () {}, function () {});
@@ -61,6 +62,7 @@ function it_removes_ending_slashes(
 
         $uri->withPath('/api/users')->shouldBeCalled()->willReturn($uri);
         $uri->getPath()->shouldBeCalled()->willReturn('/users');
+        $uri->__toString()->shouldBeCalled()->willReturn('https://example.com/api/users');
 
         $this->beConstructedWith($host);
         $this->handleRequest($request, function () {}, function () {});

spec/Plugin/BaseUriPluginSpec.php

@@ -36,20 +36,21 @@ function it_adds_domain_and_path(
         UriInterface $host,
         UriInterface $uri
     ) {
-        $host->getScheme()->shouldBeCalled()->willReturn('http://');
+        $host->getScheme()->shouldBeCalled()->willReturn('https://');
         $host->getHost()->shouldBeCalled()->willReturn('example.com');
         $host->getPort()->shouldBeCalled()->willReturn(8000);
         $host->getPath()->shouldBeCalled()->willReturn('/api');
 
         $request->getUri()->shouldBeCalled()->willReturn($uri);
         $request->withUri($uri)->shouldBeCalled()->willReturn($request);
 
-        $uri->withScheme('http://')->shouldBeCalled()->willReturn($uri);
+        $uri->withScheme('https://')->shouldBeCalled()->willReturn($uri);
         $uri->withHost('example.com')->shouldBeCalled()->willReturn($uri);
         $uri->withPort(8000)->shouldBeCalled()->willReturn($uri);
         $uri->withPath('/api/users')->shouldBeCalled()->willReturn($uri);
         $uri->getHost()->shouldBeCalled()->willReturn('');
         $uri->getPath()->shouldBeCalled()->willReturn('/users');
+        $uri->__toString()->shouldBeCalled()->willReturn('https://example.com/api/users');
 
         $this->beConstructedWith($host);
         $this->handleRequest($request, function () {}, function () {});
@@ -60,15 +61,15 @@ function it_adds_domain(
         UriInterface $host,
         UriInterface $uri
     ) {
-        $host->getScheme()->shouldBeCalled()->willReturn('http://');
+        $host->getScheme()->shouldBeCalled()->willReturn('https://');
         $host->getHost()->shouldBeCalled()->willReturn('example.com');
         $host->getPort()->shouldBeCalled()->willReturn(8000);
         $host->getPath()->shouldBeCalled()->willReturn('/');
 
         $request->getUri()->shouldBeCalled()->willReturn($uri);
         $request->withUri($uri)->shouldBeCalled()->willReturn($request);
 
-        $uri->withScheme('http://')->shouldBeCalled()->willReturn($uri);
+        $uri->withScheme('https://')->shouldBeCalled()->willReturn($uri);
         $uri->withHost('example.com')->shouldBeCalled()->willReturn($uri);
         $uri->withPort(8000)->shouldBeCalled()->willReturn($uri);
         $uri->getHost()->shouldBeCalled()->willReturn('');
@@ -82,19 +83,20 @@ function it_replaces_domain_and_adds_path(
         UriInterface $host,
         UriInterface $uri
     ) {
-        $host->getScheme()->shouldBeCalled()->willReturn('http://');
+        $host->getScheme()->shouldBeCalled()->willReturn('https://');
         $host->getHost()->shouldBeCalled()->willReturn('example.com');
         $host->getPort()->shouldBeCalled()->willReturn(8000);
         $host->getPath()->shouldBeCalled()->willReturn('/api');
 
         $request->getUri()->shouldBeCalled()->willReturn($uri);
         $request->withUri($uri)->shouldBeCalled()->willReturn($request);
 
-        $uri->withScheme('http://')->shouldBeCalled()->willReturn($uri);
+        $uri->withScheme('https://')->shouldBeCalled()->willReturn($uri);
         $uri->withHost('example.com')->shouldBeCalled()->willReturn($uri);
         $uri->withPort(8000)->shouldBeCalled()->willReturn($uri);
         $uri->withPath('/api/users')->shouldBeCalled()->willReturn($uri);
         $uri->getPath()->shouldBeCalled()->willReturn('/users');
+        $uri->__toString()->shouldBeCalled()->willReturn('https://example.com/api/users');
 
         $this->beConstructedWith($host, ['replace' => true]);
         $this->handleRequest($request, function () {}, function () {});

src/Plugin/AddPathPlugin.php

@@ -46,13 +46,17 @@ public function __construct(UriInterface $uri)
      */
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
-        $identifier = spl_object_hash((object) $first);
+        // Use the request URI as an identifier
+        $identifier = sha1((string) (string) $request->getUri());
 
+        // If the current URL is a result of a previous rewrite, then do nothing.
         if (!array_key_exists($identifier, $this->alteredRequests)) {
-            $request = $request->withUri($request->getUri()
-                ->withPath($this->uri->getPath().$request->getUri()->getPath())
-            );
-            $this->alteredRequests[$identifier] = $identifier;
+            $prefixedPath = $this->uri->getPath().$request->getUri()->getPath();
+            $prefixedUri = $request->getUri()->withPath($prefixedPath);
+            $request = $request->withUri($prefixedUri);
+
+            // Store for future checks
+            $this->alteredRequests[sha1((string) $prefixedUri)] = true;
         }
 
         return $next($request);