From 0b0862504d0dd7385c2c597f2e86863fa2ef1b87 Mon Sep 17 00:00:00 2001 From: Martin Hettiger Date: Tue, 14 Jul 2020 15:20:51 +0200 Subject: [PATCH] Use custom models in purge command if set --- src/Console/PurgeCommand.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/Console/PurgeCommand.php b/src/Console/PurgeCommand.php index f70064aa2..7854c6ab2 100644 --- a/src/Console/PurgeCommand.php +++ b/src/Console/PurgeCommand.php @@ -4,9 +4,7 @@ use Illuminate\Console\Command; use Illuminate\Support\Carbon; -use Laravel\Passport\AuthCode; -use Laravel\Passport\RefreshToken; -use Laravel\Passport\Token; +use Laravel\Passport\Passport; class PurgeCommand extends Command { @@ -35,21 +33,21 @@ public function handle() if (($this->option('revoked') && $this->option('expired')) || (! $this->option('revoked') && ! $this->option('expired'))) { - Token::where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); - AuthCode::where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); - RefreshToken::where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); + Passport::token()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); + Passport::authCode()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); + Passport::refreshToken()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete(); $this->info('Purged revoked items and items expired for more than seven days.'); } elseif ($this->option('revoked')) { - Token::where('revoked', 1)->delete(); - AuthCode::where('revoked', 1)->delete(); - RefreshToken::where('revoked', 1)->delete(); + Passport::token()->where('revoked', 1)->delete(); + Passport::authCode()->where('revoked', 1)->delete(); + Passport::refreshToken()->where('revoked', 1)->delete(); $this->info('Purged revoked items.'); } elseif ($this->option('expired')) { - Token::whereDate('expires_at', '<', $expired)->delete(); - AuthCode::whereDate('expires_at', '<', $expired)->delete(); - RefreshToken::whereDate('expires_at', '<', $expired)->delete(); + Passport::token()->whereDate('expires_at', '<', $expired)->delete(); + Passport::authCode()->whereDate('expires_at', '<', $expired)->delete(); + Passport::refreshToken()->whereDate('expires_at', '<', $expired)->delete(); $this->info('Purged items expired for more than seven days.'); }