Skip to content

Commit 64b30b4

Browse files
Ignore updating last_used_at for deciding the DB connection host (#283)
* moved the updating of last_used_at timestamp to terminating callback * updated the style * fixed style ci issues * fixed style ci issues * reverted issues * removed the forceFill method * fixed style ci issues * Update Guard.php * Update PersonalAccessToken.php * Update Guard.php Co-authored-by: Taylor Otwell <taylor@laravel.com>
1 parent d62aa7c commit 64b30b4

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/Guard.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,25 @@ public function __invoke(Request $request)
6565

6666
$accessToken = $model::findToken($token);
6767

68-
if (! $this->isValidAccessToken($accessToken)) {
68+
if (! $this->isValidAccessToken($accessToken) ||
69+
! $this->supportsTokens($accessToken->tokenable)) {
6970
return;
7071
}
7172

72-
return $this->supportsTokens($accessToken->tokenable) ? $accessToken->tokenable->withAccessToken(
73-
tap($accessToken->forceFill(['last_used_at' => now()]))->save()
74-
) : null;
73+
if (method_exists($accessToken->getConnection(), 'hasModifiedRecords') &&
74+
method_exists($accessToken->getConnection(), 'recordsHaveBeenModified')) {
75+
tap($accessToken->getConnection()->hasModifiedRecords(), function ($hasModifiedRecords) use ($accessToken) {
76+
$accessToken->forceFill(['last_used_at' => now()])->save();
77+
78+
$accessToken->getConnection()->recordsHaveBeenModified($hasModifiedRecords);
79+
});
80+
} else {
81+
$accessToken->forceFill(['last_used_at' => now()])->save();
82+
}
83+
84+
return $accessToken->tokenable->withAccessToken(
85+
$accessToken
86+
);
7587
}
7688
}
7789

0 commit comments

Comments
 (0)