Skip to content

Fix OAuth2 token expiration timezone handling #557

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix OAuth2 token expiration timezone handling #557

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
19 changes: 12 additions & 7 deletions src/Core/OAuth/OAuth2/OAuth2AccessToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,25 +247,27 @@ public function getAccessTokenValidationPeriodInSeconds(){

/**
* Return the expiration date of Access Token
* @param string $timezone Optional timezone (e.g., 'America/New_York', 'Asia/Jakarta'). Defaults to UTC.
* @return Date
*/
public function getAccessTokenExpiresAt(){
public function getAccessTokenExpiresAt($timezone = 'UTC'){
if(!empty($this->accessTokenExpiresAt))
{
return $this->getDateFromSeconds($this->accessTokenExpiresAt);
return $this->getDateFromSeconds($this->accessTokenExpiresAt, $timezone);
}else{
throw new SdkException("The Expiration Time for OAuth 2 Access Token is not set.");
}
}

/**
* Return the expiration date of refresh Token
* @param string $timezone Optional timezone (e.g., 'America/New_York', 'Asia/Jakarta'). Defaults to UTC.
* @return int
*/
public function getRefreshTokenExpiresAt(){
public function getRefreshTokenExpiresAt($timezone = 'UTC'){
if(!empty($this->refreshTokenExpiresAt))
{
return $this->getDateFromSeconds($this->refreshTokenExpiresAt);
return $this->getDateFromSeconds($this->refreshTokenExpiresAt, $timezone);
}else{
throw new SdkException("The Expiration Time for OAuth 2 refresh Token is not set.");
}
Expand Down Expand Up @@ -355,10 +357,13 @@ public function updateAccessToken($tokenExpiresTime, $refreshToken, $refreshToke

/**
* A helper function to convert Seconds to date
* @param int $second
* @param int $seconds
* @param string $timezone
* @return string
*/
private function getDateFromSeconds($seconds){
return date('Y/m/d H:i:s', $seconds);
private function getDateFromSeconds($seconds, $timezone = 'UTC'){
$dt = new \DateTime("@$seconds");
$dt->setTimezone(new \DateTimeZone($timezone));
return $dt->format('Y/m/d H:i:s') . ' ' . $timezone;
}
}