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.

Sign up for GitHub

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

Fix compatibility with Carbon 3.x #2273

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Fix compatibility with Carbon 3.x #2273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/Blacklist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,18 @@ public function add(Payload $payload)
*/
protected function getMinutesUntilExpired(Payload $payload)
{
$exp = Utils::timestamp($payload['exp']);
$iat = Utils::timestamp($payload['iat']);
$now = time();
$exp = (int) $payload['exp'];
$iat = (int) $payload['iat'];

// get the latter of the two expiration timestamps
$latterTs = max([$exp, $iat + 60 * $this->refreshTTL]);

// find the number of minutes until the expiration timestamp
$minutesUntilExpired = (int) (($latterTs - $now) / 60);

// get the latter of the two expiration dates and find
// the number of minutes until the expiration date,
// plus 1 minute to avoid overlap
return $exp->max($iat->addMinutes($this->refreshTTL))->addMinute()->diffInRealMinutes();
return $minutesUntilExpired + 1;
}

/**
Expand Down