CMS-2044 - Ensure redirects are forwarded to Laravel correctly

Author: riasvdv

yii2-adapter/src/Web/Response.php

@@ -65,13 +65,26 @@ class Response extends \yii\web\Response implements Responsable
      */
     private $_illuminateResponse;
 
+    private bool $_illuminateResponseInjected = false;
+
+    private bool $_illuminateResponsePrepared = false;
+
     /**
      * @param  bool  $create  whether to create a response, if it is empty.
      */
     public function getIlluminateResponse(bool $create = false): ?SymfonyResponse
     {
-        if ($create) {
-            $this->_illuminateResponse ??= $this->createIlluminateResponse();
+        if ($create && !$this->_illuminateResponsePrepared) {
+            if ($this->_illuminateResponse === null) {
+                $this->prepare();
+            }
+
+            if (!$this->_illuminateResponseInjected && $this->_illuminateResponse !== null) {
+                $this->sendHeaders();
+                $this->sendContent();
+            }
+
+            $this->_illuminateResponsePrepared = true;
         }
 
         return $this->_illuminateResponse;
@@ -85,6 +98,8 @@ protected function createIlluminateResponse(): IlluminateResponse
     public function setIlluminateResponse(SymfonyResponse $response): static
     {
         $this->_illuminateResponse = $response;
+        $this->_illuminateResponseInjected = true;
+        $this->_illuminateResponsePrepared = true;
 
         return $this;
     }
@@ -97,6 +112,8 @@ public function clear(): void
         parent::clear();
 
         $this->_illuminateResponse = null;
+        $this->_illuminateResponseInjected = false;
+        $this->_illuminateResponsePrepared = false;
     }
 
     /**

yii2-adapter/tests/unit/web/ResponseTest.php

@@ -90,6 +90,18 @@ public function testRedirect(string $expected, mixed $url): void
         );
     }
 
+    public function testGetIlluminateResponseCopiesRedirectHeaders(): void
+    {
+        Craft::$app->getRequest()->setIsConsoleRequest(false);
+
+        $illuminateResponse = $this->response
+            ->redirect('/admin/stripe/settings')
+            ->getIlluminateResponse(true);
+
+        self::assertSame(302, $illuminateResponse->getStatusCode());
+        self::assertSame('https://localhost/admin/stripe/settings', str_replace(':80', '', $illuminateResponse->headers->get('Location')));
+    }
+
     /**
      * @return array
      */