3ba47ad02a
Three orthogonal fixes that together close the gap where social tokens
were silently aging out without ever being refreshed, then dying at the
provider when the refresh_token also got revoked.
The original failure mode: a user's X token expired because the hourly
proactive-refresh cron's smart `verify()` skip-logic kept saying 'token
still works, no need to refresh', and once the token actually expired,
the cron's WHERE clause excluded it from future runs. By the time anyone
noticed, the refresh_token at X was also gone.
(C) ConnectionVerifier: rename private `refreshTokenIfNeeded` →
public `refreshToken`. Callers that want the smart 'try
access_token first' behavior keep using `verify()`. Callers that
want a proactive refresh (the cron) call `refreshToken` directly.
(B) RefreshExpiringTokens command: drop the
`where('token_expires_at', '>', now())` filter. Already-expired
tokens now get a last-chance refresh attempt before the
refresh_token also dies at the provider. Status filter
(`Connected`) still excludes accounts already marked TokenExpired.
(D) RefreshSocialToken job: switch from `verify()` to
`refreshToken()`, and on `TokenExpiredException` call
`markAsTokenExpired` so the user is notified immediately. The lock
+ transition detection in markAsTokenExpired prevents notification
spam if subsequent cron passes also fail.
Tests:
- 3 new tests for RefreshSocialToken (calls refreshToken not verify,
marks TokenExpired on TokenExpiredException, logs warning on other
errors)
- Updated RefreshExpiringTokens test to assert already-expired tokens
are now dispatched (was previously asserted as 'should NOT')
35 lines
979 B
PHP
35 lines
979 B
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Console\Commands;
|
|
|
|
use App\Enums\SocialAccount\Status;
|
|
use App\Jobs\RefreshSocialToken;
|
|
use App\Models\SocialAccount;
|
|
use Illuminate\Console\Command;
|
|
|
|
class RefreshExpiringTokens extends Command
|
|
{
|
|
protected $signature = 'social:refresh-expiring-tokens';
|
|
|
|
protected $description = 'Proactively refresh tokens expiring in the next 2 hours (or already expired)';
|
|
|
|
public function handle(): void
|
|
{
|
|
$count = 0;
|
|
|
|
SocialAccount::query()
|
|
->where('status', Status::Connected)
|
|
->whereNotNull('token_expires_at')
|
|
->where('token_expires_at', '<=', now()->addHours(2))
|
|
->chunk(50, function ($accounts) use (&$count) {
|
|
foreach ($accounts as $account) {
|
|
RefreshSocialToken::dispatch($account);
|
|
$count++;
|
|
}
|
|
});
|
|
|
|
$this->info("Dispatched {$count} token refresh jobs.");
|
|
}
|
|
}
|