Restore request and session

Author: timacdonald

src/ResponseFactory.php

@@ -107,14 +107,28 @@ public function render(string $component, $props = []): Response
      */
     public function location($url): \Symfony\Component\HttpFoundation\Response
     {
+        $request = $session = null;
+
         if ($url instanceof RedirectResponse) {
+            $request = $url->getRequest();
+
+            $session = $url->getSession();
+
             $url = $url->getTargetUrl();
         }
 
         if (Request::inertia()) {
             return BaseResponse::make('', 409, ['X-Inertia-Location' => $url]);
         }
 
-        return new RedirectResponse($url);
+        return tap(new RedirectResponse($url), function ($redirect) use ($request, $session) {
+            if ($request) {
+                $redirect->setRequest($request);
+            }
+
+            if ($session) {
+                $redirect->setSession($session);
+            }
+        });
     }
 }

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,20 @@ 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_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());
+    }
+
     public function test_the_version_can_be_a_closure(): void
     {
         Route::middleware([StartSession::class, ExampleMiddleware::class])->get('/', function () {