Improve URL handling with support for trailing slashes

Author: ljbw

src/Response.php

@@ -109,7 +109,7 @@ public function toResponse($request)
             [
                 'component' => $this->component,
                 'props' => $props,
-                'url' => Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/'),
+                'url' => $this->getRequestUrl($request),
                 'version' => $this->version,
                 'clearHistory' => $this->clearHistory,
                 'encryptHistory' => $this->encryptHistory,
@@ -359,4 +359,21 @@ public function isPartial(Request $request): bool
     {
         return $request->header(Header::PARTIAL_COMPONENT) === $this->component;
     }
+
+    /**
+     * Get the request URL with proper handling of proxy prefixes and trailing slashes.
+     */
+    protected function getRequestUrl(Request $request): string
+    {
+        $uri = $request->getRequestUri();
+        
+        // Handle X-Forwarded-Prefix header for proxy setups
+        if ($prefix = $request->header('X_FORWARDED_PREFIX')) {
+            if (!str_starts_with($uri, $prefix)) {
+                $uri = $prefix . $uri;
+            }
+        }
+        
+        return $uri;
+    }
 }

tests/ResponseTest.php

@@ -827,4 +827,72 @@ public function test_the_page_url_doesnt_double_up(): void
 
         $this->assertSame('/subpath/product/123', $page->url);
     }
+    
+    public function test_trailing_slashes_in_url_are_preserved(): void
+    {
+        // Test with trailing slash in the URL
+        $request = Request::create('/categories/', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/categories/', $page->url);
+        
+        // Test with trailing slash and query parameters
+        $request = Request::create('/categories/?page=1&sort=name', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/categories/?page=1&sort=name', $page->url);
+        
+        // Test with trailing slash and proxy prefix
+        $request = Request::create('/categories/', 'GET');
+        $request->headers->set('X_FORWARDED_PREFIX', '/admin');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/admin/categories/', $page->url);
+    }
+    
+    public function test_non_trailing_slashes_in_url_work_correctly(): void
+    {
+        // Test with non-trailing slash in the URL
+        $request = Request::create('/categories', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/categories', $page->url);
+        
+        // Test with non-trailing slash and query parameters
+        $request = Request::create('/categories?page=1&sort=name', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/categories?page=1&sort=name', $page->url);
+        
+        // Test with non-trailing slash and proxy prefix
+        $request = Request::create('/categories', 'GET');
+        $request->headers->set('X_FORWARDED_PREFIX', '/admin');
+        $request->headers->add(['X-Inertia' => 'true']);
+        
+        $response = new Response('Category/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+        
+        $this->assertSame('/admin/categories', $page->url);
+    }
 }