ENGCOM-1720: [BUGFIX] #15564 Generated admin API token expires immediately #15598

magento-engcom-team · magento-engcom-team · commit 5e97f0824f61 · 2018-05-30T09:02:19.000-05:00
- Merge Pull Request #15598 from krukas/magento2:15564 - Merged commits: 1. eab3674 2. 3ca1c6f
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -133,6 +133,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;
         }

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,11 @@ private function isTokenExpired(Token $token): bool`
`133`	`133`	`// other user-type tokens are considered always valid`
`134`	`134`	`return false;`
`135`	`135`	`}`
	`136`	`+`
	`137`	`+ if (empty($tokenTtl)) {`
	`138`	`+ return false;`
	`139`	`+ }`
	`140`	`+`
`136`	`141`	`if ($this->dateTime->strToTime($token->getCreatedAt()) < ($this->date->gmtTimestamp() - $tokenTtl * 3600)) {`
`137`	`142`	`return true;`
`138`	`143`	`}`