From 2ed6e7643d28cce7f8f77af23ca7af9530150263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 10 Aug 2021 10:18:05 +0200 Subject: [PATCH] Redirect to url if `next` is available for key_login --- app/Http/Middleware/ContactKeyLogin.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php index b339ab90a86d..0fc58c69f8af 100644 --- a/app/Http/Middleware/ContactKeyLogin.php +++ b/app/Http/Middleware/ContactKeyLogin.php @@ -71,11 +71,16 @@ class ContactKeyLogin } } elseif ($request->segment(2) && $request->segment(2) == 'key_login' && $request->segment(3)) { if ($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()) { - - if(empty($client_contact->email)) + if(empty($client_contact->email)) { $client_contact->email = Str::random(6) . "@example.com"; $client_contact->save(); + } auth()->guard('contact')->login($client_contact, true); + + if ($request->query('next')) { + return redirect($request->query('next')); + } + return redirect()->to('client/dashboard'); } } elseif ($request->has('client_hash') && config('ninja.db.multi_db_enabled')) { @@ -106,7 +111,6 @@ class ContactKeyLogin } } - return $next($request); } }