Skip to content

Commit 915b728

Browse files
committed
Merge pull request #751 from hieugroup/patch-1
Fix token expiry issue because of time zone difference
2 parents cee66ee + e4485d9 commit 915b728

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/Jenssegers/Mongodb/Auth/DatabaseTokenRepository.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ protected function tokenExpired($token)
2828
// Convert UTCDateTime to a date string.
2929
if ($token['created_at'] instanceof UTCDateTime) {
3030
$date = $token['created_at']->toDateTime();
31+
$date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
3132
$token['created_at'] = $date->format('Y-m-d H:i:s');
3233
} elseif (is_array($token['created_at']) and isset($token['created_at']['date'])) {
33-
$token['created_at'] = $token['created_at']['date'];
34+
$date = new DateTime($token['created_at']['date'], new DateTimeZone(isset($token['created_at']['timezone']) ? $token['created_at']['timezone'] : 'UTC'));
35+
$date->setTimezone(date_default_timezone_get());
36+
$token['created_at'] = $date->format('Y-m-d H:i:s');
3437
}
3538

3639
return parent::tokenExpired($token);

0 commit comments

Comments
 (0)