ENGCOM-2066: [Forwardport] [BUGFIX] #15564 Generated admin API token expires immediately #15744

magento-engcom-team · magento-engcom-team · commit 9669bd6fdcaa · 2018-06-20T07:45:19.000-05:00
- Merge Pull Request #15744 from vijay-wagento/magento2:2.3-develop-PR-port-15598 - Merged commits: 1. 7f34b22 2. 349d178
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;
         }

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