From f19007f42466ebf881307670a32d14516444ac24 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 12 Mar 2025 11:18:56 +0100 Subject: [PATCH] Merge commit from fork --- .../core/src/Http/Middleware/RememberFromCookie.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/framework/core/src/Http/Middleware/RememberFromCookie.php b/framework/core/src/Http/Middleware/RememberFromCookie.php index c5d8315f6..25551f89b 100644 --- a/framework/core/src/Http/Middleware/RememberFromCookie.php +++ b/framework/core/src/Http/Middleware/RememberFromCookie.php @@ -37,7 +37,18 @@ class RememberFromCookie implements Middleware /** @var \Illuminate\Contracts\Session\Session $session */ $session = $request->getAttribute('session'); - $session->put('access_token', $token->token); + $currentAccessToken = $session->get('access_token'); + + if ($currentAccessToken !== $token->token) { + $session->invalidate(); + $session->regenerateToken(); + + if ($currentAccessToken) { + AccessToken::whereToken($currentAccessToken)->delete(); + } + + $session->put('access_token', $token->token); + } } }