Merge pull request #539 from timacdonald/session

Restore request and session on redirects

Author: jessarcher

src/ResponseFactory.php

@@ -5,11 +5,13 @@
 use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\App;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response as BaseResponse;
+use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirect;
 
 class ResponseFactory
 {
@@ -103,18 +105,14 @@ public function render(string $component, $props = []): Response
     }
 
     /**
-     * @param string|RedirectResponse $url
+     * @param string|SymfonyRedirect $url
      */
-    public function location($url): \Symfony\Component\HttpFoundation\Response
+    public function location($url): SymfonyResponse
     {
-        if ($url instanceof RedirectResponse) {
-            $url = $url->getTargetUrl();
-        }
-
         if (Request::inertia()) {
-            return BaseResponse::make('', 409, ['X-Inertia-Location' => $url]);
+            return BaseResponse::make('', 409, ['X-Inertia-Location' => $url instanceof SymfonyRedirect ? $url->getTargetUrl() : $url]);
         }
 
-        return new RedirectResponse($url);
+        return $url instanceof SymfonyRedirect ? $url : Redirect::away($url);
     }
 }

tests/ResponseFactoryTest.php

@@ -11,7 +11,10 @@
 use Illuminate\Support\Facades\Request;
 use Inertia\Tests\Stubs\ExampleMiddleware;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Http\Request as HttpRequest;
 use Illuminate\Session\Middleware\StartSession;
+use Illuminate\Session\NullSessionHandler;
+use Illuminate\Session\Store;
 
 class ResponseFactoryTest extends TestCase
 {
@@ -75,6 +78,30 @@ public function test_location_response_for_non_inertia_requests_using_redirect_r
         $this->assertEquals('https://inertiajs.com', $response->headers->get('location'));
     }
 
+    public function test_location_redirects_are_not_modified(): void
+    {
+        $response = (new ResponseFactory())->location('/foo');
+
+        $this->assertInstanceOf(RedirectResponse::class, $response);
+        $this->assertEquals(Response::HTTP_FOUND, $response->getStatusCode());
+        $this->assertEquals('/foo', $response->headers->get('location'));
+    }
+
+    public function test_location_response_for_non_inertia_requests_using_redirect_response_with_existing_session_and_request_properties(): void
+    {
+        $redirect = new RedirectResponse('https://inertiajs.com');
+        $redirect->setSession($session = new Store('test', new NullSessionHandler));
+        $redirect->setRequest($request = new HttpRequest);
+        $response = (new ResponseFactory())->location($redirect);
+
+        $this->assertInstanceOf(RedirectResponse::class, $response);
+        $this->assertEquals(Response::HTTP_FOUND, $response->getStatusCode());
+        $this->assertEquals('https://inertiajs.com', $response->headers->get('location'));
+        $this->assertSame($session, $response->getSession());
+        $this->assertSame($request, $response->getRequest());
+        $this->assertSame($response, $redirect);
+    }
+
     public function test_the_version_can_be_a_closure(): void
     {
         Route::middleware([StartSession::class, ExampleMiddleware::class])->get('/', function () {