Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.x] Revert "[10.x] Add purging of invalid refresh tokens to command" #1397

Merged
merged 1 commit into from
Jan 14, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions src/Console/PurgeCommand.php
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ class PurgeCommand extends Command
*
* @var string
*/
protected $description = 'Purge revoked and / or expired tokens, authentication codes, and refresh tokens.';
protected $description = 'Purge revoked and / or expired tokens and authentication codes';

/**
* Execute the console command.
@@ -36,23 +36,20 @@ public function handle()
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();
Passport::refreshToken()->whereDoesntHave('accessToken')->delete();

$this->info('Purged invalid refresh tokens, revoked tokens, and tokens expired for more than seven days.');
$this->info('Purged revoked items and items expired for more than seven days.');
} elseif ($this->option('revoked')) {
Passport::token()->where('revoked', 1)->delete();
Passport::authCode()->where('revoked', 1)->delete();
Passport::refreshToken()->where('revoked', 1)->delete();
Passport::refreshToken()->whereDoesntHave('accessToken')->delete();

$this->info('Purged invalid refresh tokens and revoked tokens.');
$this->info('Purged revoked items.');
} elseif ($this->option('expired')) {
Passport::token()->whereDate('expires_at', '<', $expired)->delete();
Passport::authCode()->whereDate('expires_at', '<', $expired)->delete();
Passport::refreshToken()->whereDate('expires_at', '<', $expired)->delete();
Passport::refreshToken()->whereDoesntHave('accessToken')->delete();

$this->info('Purged invalid refresh tokens and tokens expired for more than seven days.');
$this->info('Purged items expired for more than seven days.');
}
}
}
45 changes: 0 additions & 45 deletions tests/Feature/Console/PurgeCommand.php

This file was deleted.