2f4b974130
X OAuth2 refresh tokens are single-use: each refresh rotates the pair and invalidates the previous refresh_token, and reusing a rotated one kills the whole family. Three things made this fragile and disconnected accounts far more often than necessary: - The proactive refresh job called refreshToken() directly, bypassing the access-token-first guard in verify() and rotating on every run. - RefreshExpiringTokens used a 2h window on an hourly schedule — equal to the 2h access-token lifetime — so every X account was rotated every hour even while its token was still valid. - A single 4xx refresh failure disconnected the account without checking whether a concurrent refresh had already persisted a working token. Changes: - RefreshSocialToken now routes through verify() (access-token-first), so it only rotates when the access_token is actually invalid. - Shrink the proactive window to 30m and run the command every 15m, so the window still covers the run interval but rotation happens near real expiry. - verify() tolerates the lost-rotation race: on a 4xx refresh, reload and verify with a concurrently-refreshed token before marking TokenExpired. Refs #126
35 lines
985 B
PHP
35 lines
985 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 30 minutes (or already expired)';
|
|
|
|
public function handle(): void
|
|
{
|
|
$count = 0;
|
|
|
|
SocialAccount::query()
|
|
->where('status', Status::Connected)
|
|
->whereNotNull('token_expires_at')
|
|
->where('token_expires_at', '<=', now()->addMinutes(30))
|
|
->chunk(50, function ($accounts) use (&$count) {
|
|
foreach ($accounts as $account) {
|
|
RefreshSocialToken::dispatch($account);
|
|
$count++;
|
|
}
|
|
});
|
|
|
|
$this->info("Dispatched {$count} token refresh jobs.");
|
|
}
|
|
}
|