From f989a06dc8d51c21dadb5525592bb475d2942ad0 Mon Sep 17 00:00:00 2001
From: Constantin Graf <constantin@solidtime.io>
Date: Wed, 1 May 2024 21:40:29 +0200
Subject: [PATCH] Fixed redirect after login for filament admin panel

---
 .../Fortify/CustomLoginResponse.php           | 27 +++++++++++++++++++
 app/Providers/FortifyServiceProvider.php      |  4 +++
 2 files changed, 31 insertions(+)
 create mode 100644 app/Extensions/Fortify/CustomLoginResponse.php

diff --git a/app/Extensions/Fortify/CustomLoginResponse.php b/app/Extensions/Fortify/CustomLoginResponse.php
new file mode 100644
index 00000000..608f10fe
--- /dev/null
+++ b/app/Extensions/Fortify/CustomLoginResponse.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Extensions\Fortify;
+
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Laravel\Fortify\Http\Responses\LoginResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+class CustomLoginResponse extends LoginResponse
+{
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  Request  $request
+     */
+    public function toResponse($request): Response
+    {
+        $redirectPath = session()->pull('url.intended', route('dashboard', [], false));
+
+        return $request->wantsJson()
+            ? response()->json(['two_factor' => false])
+            : Inertia::location($redirectPath);
+    }
+}
diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
index bd5166d4..4dbe82d4 100644
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -8,6 +8,7 @@ use App\Actions\Fortify\CreateNewUser;
 use App\Actions\Fortify\ResetUserPassword;
 use App\Actions\Fortify\UpdateUserPassword;
 use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Extensions\Fortify\CustomLoginResponse;
 use App\Models\User;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
@@ -16,6 +17,7 @@ use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Http\Responses\LoginResponse;
 
 class FortifyServiceProvider extends ServiceProvider
 {
@@ -60,5 +62,7 @@ class FortifyServiceProvider extends ServiceProvider
         RateLimiter::for('two-factor', function (Request $request) {
             return Limit::perMinute(5)->by($request->session()->get('login.id'));
         });
+
+        $this->app->instance(LoginResponse::class, new CustomLoginResponse());
     }
 }