Make flash data survive

Author: pascalbaljet

src/Inertia.php

@@ -32,6 +32,7 @@
  * @method static \Inertia\ResponseFactory flash(\BackedEnum|\UnitEnum|string|array<string, mixed> $key, mixed $value = null)
  * @method static \Symfony\Component\HttpFoundation\RedirectResponse back(int $status = 302, array<string, string> $headers = [], mixed $fallback = false)
  * @method static array<string, mixed> getFlashed(\Illuminate\Http\Request|null $request = null)
+ * @method static array<string, mixed> pullFlashed(\Illuminate\Http\Request|null $request = null)
  * @method static void macro(string $name, object|callable $macro)
  * @method static void mixin(object $mixin, bool $replace = true)
  * @method static bool hasMacro(string $name)

src/Response.php

@@ -238,7 +238,7 @@ protected function resolveEncryptHistory(Request $request): array
      */
     protected function resolveFlashData(Request $request): array
     {
-        $flash = Inertia::getFlashed($request);
+        $flash = Inertia::pullFlashed($request);
 
         return $flash ? ['flash' => $flash] : [];
     }

src/ResponseFactory.php

@@ -451,7 +451,7 @@ public function flash(BackedEnum|UnitEnum|string|array $key, mixed $value = null
             $flash = [$key => $value];
         }
 
-        session()->now(SessionKey::FLASH_DATA, [
+        session()->flash(SessionKey::FLASH_DATA, [
             ...$this->getFlashed(),
             ...$flash,
         ]);
@@ -480,4 +480,16 @@ public function getFlashed(?HttpRequest $request = null): array
 
         return $request->hasSession() ? $request->session()->get(SessionKey::FLASH_DATA, []) : [];
     }
+
+    /**
+     * Retrieve and remove the flashed data from the session.
+     *
+     * @return array<string, mixed>
+     */
+    public function pullFlashed(?HttpRequest $request = null): array
+    {
+        $request ??= request();
+
+        return $request->hasSession() ? $request->session()->pull(SessionKey::FLASH_DATA, []) : [];
+    }
 }

src/ServiceProvider.php

@@ -66,8 +66,7 @@ public function boot(): void
     }
 
     /**
-     * Ensure redirects after PUT/PATCH/DELETE Inertia requests result
-     * in a GET request, even when other middleware short-circuits.
+     * Register the global redirect middleware for Inertia requests.
      */
     protected function pushRedirectMiddleware(): void
     {

tests/Testing/AssertableInertiaTest.php

@@ -484,4 +484,27 @@ public function test_the_flash_data_is_available_after_redirect(): void
         $this->get('/action')->assertRedirect('/dashboard');
         $this->get('/dashboard')->assertInertia(fn (AssertableInertia $inertia) => $inertia->hasFlash('message', 'Success!'));
     }
+
+    public function test_the_flash_data_is_available_after_double_redirect(): void
+    {
+        $middleware = [StartSession::class, Middleware::class];
+
+        Route::middleware($middleware)->get('/action', function () {
+            Inertia::flash('message', 'Success!');
+
+            return redirect('/intermediate');
+        });
+
+        Route::middleware($middleware)->get('/intermediate', function () {
+            return redirect('/dashboard');
+        });
+
+        Route::middleware($middleware)->get('/dashboard', function () {
+            return Inertia::render('Dashboard');
+        });
+
+        $this->get('/action')->assertRedirect('/intermediate');
+        $this->get('/intermediate')->assertRedirect('/dashboard');
+        $this->get('/dashboard')->assertInertia(fn (AssertableInertia $inertia) => $inertia->hasFlash('message', 'Success!'));
+    }
 }