Skip to content

Commit

Permalink
Use custom models in purge command if set (#1316)
Browse files Browse the repository at this point in the history
  • Loading branch information
hettiger authored Jul 14, 2020
1 parent 98b4425 commit 248b95a
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions src/Console/PurgeCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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.');
}
Expand Down

0 comments on commit 248b95a

Please sign in to comment.