From 7f34b221d692f9bda0b3d6c9d17c76bd65cad30a Mon Sep 17 00:00:00 2001 From: Maikel Martens Date: Wed, 30 May 2018 08:53:22 +0200 Subject: [PATCH 1/2] #15564 Generated admin API token expires immediately When admin token lifetime setting is empty, the token will expire immediatly --- .../Magento/Webapi/Model/Authorization/TokenUserContext.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php index 94196c9b86534..1b63b8c78e0b1 100644 --- 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; } From 349d178ee84de6b458d8783c16cf30bb25d51dc5 Mon Sep 17 00:00:00 2001 From: Maikel Martens Date: Wed, 30 May 2018 13:50:20 +0200 Subject: [PATCH 2/2] Remove tab --- .../Magento/Webapi/Model/Authorization/TokenUserContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php index 1b63b8c78e0b1..d89513b50c9c5 100644 --- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php +++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php @@ -134,7 +134,7 @@ private function isTokenExpired(Token $token): bool } if (empty($tokenTtl)) { - return false; + return false; } if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {