Skip to content

Commit 6c5b279

Browse files
committedApr 4, 2025
Made code clearer
1 parent ed4016e commit 6c5b279

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed
 

‎app/Http/Middleware/LoginRedirect.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Closure;
66
use Illuminate\Http\Request;
77
use Symfony\Component\HttpFoundation\Response;
8+
use Illuminate\Support\Str;
89

910
class LoginRedirect
1011
{
@@ -18,9 +19,10 @@ public function handle(Request $request, Closure $next): Response
1819
if ($request->has('next') && in_array($request->get('next'), $whitelist)) {
1920
session(['login_redirect' => route($request->get('next'))]);
2021

21-
} elseif (! (strtok(url()->previous(), '?') === route('login')) && ! (strtok(url()->previous(), '?') === route('register'))) {
22+
//Check if the user's url is coming from the login or register page, if it is don't reset the redirect variable.
23+
} elseif (! (Str::before(url()->previous(), '?') === route('login')) && ! (Str::before(url()->previous(), '?') === route('register'))) {
2224
// If the user moves outside the login page, reset the redirect variable.
23-
session(['login_redirect' => null]);
25+
session()->forget('login_redirect');
2426
}
2527
}
2628

0 commit comments

Comments
 (0)