Skip to content

Commit f19007f

Browse files
novacuumSychO9
authored andcommitted
Merge commit from fork
1 parent 15112c2 commit f19007f

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
@@ -37,7 +37,18 @@ public function process(Request $request, Handler $handler): Response
3737

3838
/** @var \Illuminate\Contracts\Session\Session $session */
3939
$session = $request->getAttribute('session');
40-
$session->put('access_token', $token->token);
40+
$currentAccessToken = $session->get('access_token');
41+
42+
if ($currentAccessToken !== $token->token) {
43+
$session->invalidate();
44+
$session->regenerateToken();
45+
46+
if ($currentAccessToken) {
47+
AccessToken::whereToken($currentAccessToken)->delete();
48+
}
49+
50+
$session->put('access_token', $token->token);
51+
}
4152
}
4253
}
4354

0 commit comments

Comments
 (0)