Re-use redirect

Author: timacdonald

src/ResponseFactory.php

@@ -9,7 +9,10 @@
 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,32 +106,18 @@ 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
     {
-        $request = $session = null;
-
-        if ($url instanceof RedirectResponse) {
-            $request = $url->getRequest();
-
-            $session = $url->getSession();
-
-            $url = $url->getTargetUrl();
-        }
+        [$url, $redirect] = $url instanceof SymfonyRedirect
+            ? [$url->getTargetUrl(), $url]
+            : [$url, Redirect::away($url)];
 
         if (Request::inertia()) {
             return BaseResponse::make('', 409, ['X-Inertia-Location' => $url]);
         }
 
-        return tap(new RedirectResponse($url), function ($redirect) use ($request, $session) {
-            if ($request) {
-                $redirect->setRequest($request);
-            }
-
-            if ($session) {
-                $redirect->setSession($session);
-            }
-        });
+        return $redirect;
     }
 }

tests/ResponseFactoryTest.php

@@ -78,6 +78,15 @@ 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');
@@ -90,6 +99,7 @@ public function test_location_response_for_non_inertia_requests_using_redirect_r
         $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