A free open source IT asset/license management system
Fix returning to intended URL on 2-factor success (or enrollment success)
Brady Wetheringtonc7afcf0befb6
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex 1e8a8cf475..8e406d92f8 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -433,7 +433,7 @@ class LoginController extends Controller$user->saveQuietly();$request->session()->put('2fa_authed', $user->id);- return redirect()->route('home')->with('success', trans('auth/message.signin.success'));+ return redirect()->intended()->with('success', trans('auth/message.signin.success'));}return redirect()->route('two-factor')->with('error', trans('auth/message.two_factor.invalid_code'));diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.phpindex 1010e227c1..0a8ead6ebb 100644--- a/app/Http/Middleware/CheckForTwoFactor.php+++ b/app/Http/Middleware/CheckForTwoFactor.php@@ -46,6 +46,7 @@ class CheckForTwoFactorreturn $next($request);}+ redirect()->setIntendedUrl(url()->full()); // save the 'current' URL so we can send the user back to it?// Otherwise make sure they're enrolled and show them the 2FA code screenif ((auth()->user()->two_factor_secret != '') && (auth()->user()->two_factor_enrolled == '1')) {return redirect()->route('two-factor')->with('info', trans('auth/message.two_factor.enter_two_factor_code'));