Skip to content

Commit 8b792b4

Browse files
authored
Revert "[10.x] Add purging of invalid refresh tokens to command (#1396)" (#1397)
This reverts commit 985577c.
1 parent 985577c commit 8b792b4

File tree

2 files changed

+4
-52
lines changed

2 files changed

+4
-52
lines changed

src/Console/PurgeCommand.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class PurgeCommand extends Command
2222
*
2323
* @var string
2424
*/
25-
protected $description = 'Purge revoked and / or expired tokens, authentication codes, and refresh tokens.';
25+
protected $description = 'Purge revoked and / or expired tokens and authentication codes';
2626

2727
/**
2828
* Execute the console command.
@@ -36,23 +36,20 @@ public function handle()
3636
Passport::token()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete();
3737
Passport::authCode()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete();
3838
Passport::refreshToken()->where('revoked', 1)->orWhereDate('expires_at', '<', $expired)->delete();
39-
Passport::refreshToken()->whereDoesntHave('accessToken')->delete();
4039

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

48-
$this->info('Purged invalid refresh tokens and revoked tokens.');
46+
$this->info('Purged revoked items.');
4947
} elseif ($this->option('expired')) {
5048
Passport::token()->whereDate('expires_at', '<', $expired)->delete();
5149
Passport::authCode()->whereDate('expires_at', '<', $expired)->delete();
5250
Passport::refreshToken()->whereDate('expires_at', '<', $expired)->delete();
53-
Passport::refreshToken()->whereDoesntHave('accessToken')->delete();
5451

55-
$this->info('Purged invalid refresh tokens and tokens expired for more than seven days.');
52+
$this->info('Purged items expired for more than seven days.');
5653
}
5754
}
5855
}

tests/Feature/Console/PurgeCommand.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)