Merge pull request #10 from vijay-wagento/2.3-develop-PR-port-15598

[Forwardport] [BUGFIX] magento#15564 Generated admin API token expires immediately
vijay-wagento · Jun 4, 2018 · c18db91 · c18db91
2 parents 19af728 + 349d178
commit c18db91
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -132,6 +132,11 @@ private function isTokenExpired(Token $token): bool
             // other user-type tokens are considered always valid
             return false;
         }
+
+        if (empty($tokenTtl)) {
+            return false;
+        }
+
         if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {
             return true;
         }