ACP2E-3340: add additional configs for fedex tracking api

Author: alzota

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

@@ -934,6 +934,19 @@ protected function _getAccessToken(): string|null
         $apiKey = $this->getConfigData('api_key') ?? null;
         $secretKey = $this->getConfigData('secret_key') ?? null;
 
+        return $this->retrieveAccessToken($apiKey, $secretKey);
+    }
+
+
+    /**
+     * Make the call to get the access token
+     *
+     * @param $apiKey
+     * @param $secretKey
+     * @return string|null
+     */
+    private function retrieveAccessToken($apiKey, $secretKey): string|null
+    {
         if (!$apiKey || !$secretKey) {
             $this->_debug(__('Authentication keys are missing.'));
             return null;
@@ -955,9 +968,23 @@ protected function _getAccessToken(): string|null
         } elseif (!empty($response['access_token'])) {
             $accessToken = $response['access_token'];
         }
+
         return $accessToken;
     }
 
+    /**
+     * Get Access Token for Tracking Rest API
+     *
+     * @return string|null
+     */
+    private function _getTrackingApiAccessToken(): string|null
+    {
+        $trackingApiKey = $this->getConfigData('tracking_api_key') ?? null;
+        $trackingSecretKey = $this->getConfigData('tracking_api_secret_key') ?? null;
+
+        return $this->retrieveAccessToken($trackingApiKey, $trackingSecretKey);
+    }
+
     /**
      * Send Curl Request
      *
@@ -1007,7 +1034,12 @@ protected function sendRequest($endpoint, $request, $accessToken = null): array|
      */
     protected function _getTrackingInformation($tracking): void
     {
-        $accessToken = $this->_getAccessToken();
+        if ($this->getConfigData('enable_tracking_api')) {
+            $accessToken = $this->_getTrackingApiAccessToken();
+        } else {
+            $accessToken = $this->_getAccessToken();
+        }
+
         if (!empty($accessToken)) {
 
             $trackRequest = [

app/code/Magento/Fedex/etc/adminhtml/system.xml

@@ -31,6 +31,32 @@
                     <label>Secret Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
+                <field id="enable_tracking_api" translate="label" type="select" sortOrder="61" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Enable Tracking API credentials</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="tracking_api_account" translate="label comment" type="obscure" sortOrder="62" showInDefault="1" showInWebsite="1">
+                    <label>Tracking API Account ID</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <comment>Please make sure to use only digits here. No dashes are allowed.</comment>
+                    <depends>
+                        <field id="enable_tracking_api">1</field>
+                    </depends>
+                </field>
+                <field id="tracking_api_key" translate="label" type="obscure" sortOrder="63" showInDefault="1" showInWebsite="1">
+                    <label>Tracking API Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="enable_tracking_api">1</field>
+                    </depends>
+                </field>
+                <field id="tracking_api_secret_key" translate="label" type="obscure" sortOrder="64" showInDefault="1" showInWebsite="1">
+                    <label>Tracking API Secret Key</label>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
+                    <depends>
+                        <field id="enable_tracking_api">1</field>
+                    </depends>
+                </field>
                 <field id="sandbox_mode" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Sandbox Mode</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>