From 3ca352d1d5fe44bff5e43fbe4c976786ddadfd1b Mon Sep 17 00:00:00 2001
From: kartubi <kartubi1@gmail.com>
Date: Thu, 28 Aug 2025 14:28:21 +0700
Subject: [PATCH] Fix OAuth2 token expiration timezone handling

Improves timezone handling for OAuth2 access and refresh token expiration dates by:

- Add optional timezone parameter to getAccessTokenExpiresAt() and getRefreshTokenExpiresAt() methods
- Update getDateFromSeconds() to accept timezone parameter and use DateTime with proper timezone conversion
- Default to UTC timezone to maintain backward compatibility
- Include timezone identifier in returned date strings for clarity

This resolves confusion where expiration dates were displayed in server's local timezone without indication, causing users to see incorrect expiration times. Now users can specify their preferred timezone or rely on clear UTC display.

Example usage:
- getAccessTokenExpiresAt() returns "2025/08/28 15:12:34 UTC"
- getAccessTokenExpiresAt('Asia/Jakarta') returns "2025/08/28 22:12:34 Asia/Jakarta"

Fixes issue where token expiration appeared to be set incorrectly due to timezone conversion problems.
---
 src/Core/OAuth/OAuth2/OAuth2AccessToken.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Core/OAuth/OAuth2/OAuth2AccessToken.php b/src/Core/OAuth/OAuth2/OAuth2AccessToken.php
index 255b6ad9..734f0af8 100644
--- a/src/Core/OAuth/OAuth2/OAuth2AccessToken.php
+++ b/src/Core/OAuth/OAuth2/OAuth2AccessToken.php
@@ -247,12 +247,13 @@ 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.");
         }
@@ -260,12 +261,13 @@ public function getAccessTokenExpiresAt(){
 
     /**
      * 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.");
       }
@@ -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;
     }
 }