Reverted change for time compression to use \Magento\Framework\Stdlib…

…\DateTime::strToTime instead of php strtotime. Updated helpers to get token expire time to check if value is positive before response.
magento · Oct 2, 2019 · fc5ff12 · fc5ff12
1 parent 0bda8d0
commit fc5ff12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/code/Magento/Integration/Helper/Oauth/Data.php b/app/code/Magento/Integration/Helper/Oauth/Data.php
@@ -121,7 +121,7 @@ public function getConsumerPostTimeout()
     public function getCustomerTokenLifetime()
     {
         $hours = $this->_scopeConfig->getValue('oauth/access_token_lifetime/customer');
-        return is_numeric($hours) ? $hours : 0;
+        return is_numeric($hours) && $hours > 0 ? $hours : 0;
     }
 
     /**
@@ -132,6 +132,6 @@ public function getCustomerTokenLifetime()
     public function getAdminTokenLifetime()
     {
         $hours = $this->_scopeConfig->getValue('oauth/access_token_lifetime/admin');
-        return is_numeric($hours) ? $hours : 0;
+        return is_numeric($hours) && $hours > 0 ? $hours : 0;
     }
 }
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -137,7 +137,7 @@ private function isTokenExpired(Token $token): bool
             return false;
         }
 
-        if (strtotime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
+        if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
             return true;
         }