Skip to content

Commit a05aaea

Browse files
authored
Merge commit from fork
1 parent 1b888e0 commit a05aaea

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

framework/core/src/Http/Middleware/RememberFromCookie.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,18 @@ public function process(Request $request, Handler $handler): Response
4545

4646
/** @var \Illuminate\Contracts\Session\Session $session */
4747
$session = $request->getAttribute('session');
48-
$session->put('access_token', $token->token);
48+
$currentAccessToken = $session->get('access_token');
49+
50+
if ($currentAccessToken !== $token->token) {
51+
$session->invalidate();
52+
$session->regenerateToken();
53+
54+
if ($currentAccessToken) {
55+
AccessToken::whereToken($currentAccessToken)->delete();
56+
}
57+
58+
$session->put('access_token', $token->token);
59+
}
4960
}
5061
}
5162

0 commit comments

Comments
 (0)