ACP2E-3930: [QUANS] - Does Magento_Fedex core module check for a valid-active token before sending a request to get a new one?

Author: soklymeach

app/code/Magento/Fedex/Model/Carrier.php

@@ -968,26 +968,16 @@ protected function _getAccessToken(): string|null
      * @param string|null $apiKey
      * @param string|null $secretKey
      * @return string|null
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function retrieveAccessToken(?string $apiKey, ?string $secretKey): string|null
     {
-        if (!$apiKey || !$secretKey) {
-            $this->_debug(__('Authentication keys are missing.'));
+        if (!$this->areAuthKeysValid($apiKey, $secretKey)) {
             return null;
         }
         $cacheKey = 'fedex_access_token_' . $apiKey . $secretKey;
         $cacheType = 'fedex_api';
-        $cachedData = $this->cache->load($cacheKey);
-        if ($cachedData) {
-            $cachedData = json_decode($cachedData, true);
-            $currentTime = time();
-            if (isset($cachedData['access_token']) &&
-                isset($cachedData['expires_at'])
-                && $currentTime < $cachedData['expires_at']
-            ) {
-                return $cachedData['access_token'];
-            }
+        if ($cachedToken = $this->getCachedAccessToken($cacheKey)) {
+            return $cachedToken;
         }
         $requestArray = [
             'grant_type' => self::AUTHENTICATION_GRANT_TYPE,
@@ -1015,6 +1005,44 @@ private function retrieveAccessToken(?string $apiKey, ?string $secretKey): strin
         return $accessToken;
     }
 
+    /**
+     * Validate apiKey and secretKey
+     *
+     * @param string|null $apiKey
+     * @param string|null $secretKey
+     * @return bool
+     */
+    private function areAuthKeysValid(?string $apiKey, ?string $secretKey): bool
+    {
+        if (!$apiKey || !$secretKey) {
+            $this->_debug(__('Authentication keys are missing.'));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Retrieve access token from cache
+     *
+     * @param string $cacheKey
+     * @return string|null
+     */
+    private function getCachedAccessToken(string $cacheKey): ?string
+    {
+        $cachedData = $this->cache->load($cacheKey);
+        if (!$cachedData) {
+            return null;
+        }
+
+        $cachedData = json_decode($cachedData, true);
+        $currentTime = time();
+        if (isset($cachedData['access_token'], $cachedData['expires_at']) && $currentTime < $cachedData['expires_at']) {
+            return $cachedData['access_token'];
+        }
+
+        return null;
+    }
+
     /**
      * Get Access Token for Tracking Rest API
      *

app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php

@@ -49,6 +49,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\CacheInterface;
 
 /**
  * CarrierTest contains units test for Fedex carrier methods
@@ -132,6 +133,11 @@ class CarrierTest extends TestCase
      */
     private DecoderInterface $decoderInterface;
 
+    /**
+     * @var CacheInterface|MockObject
+     */
+    private $cacheMock;
+
     /**
      * @return void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -206,6 +212,9 @@ protected function setUp(): void
             ->onlyMethods(['decode'])
             ->getMock();
 
+        $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
+            ->onlyMethods(['load', 'save'])
+            ->getMockForAbstractClass();
         $this->carrier = $this->getMockBuilder(Carrier::class)
             ->addMethods(['rateRequest'])
             ->setConstructorArgs(
@@ -229,6 +238,7 @@ protected function setUp(): void
                     'productCollectionFactory' => $this->collectionFactory,
                     'curlFactory' => $this->curlFactory,
                     'decoderInterface' => $this->decoderInterface,
+                    'cache' => $this->cacheMock,
                     'data' => [],
                     'serializer' => $this->serializer,
                 ]