Merge pull request #190 from bold-commerce/Q1-656

Make storefront client url configurable.
bold-commerce · Nov 28, 2023 · 38a881d · 38a881d
2 parents bfcba77 + b1e4283
commit 38a881d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/Model/Http/BoldStorefrontClient.php b/Model/Http/BoldStorefrontClient.php
@@ -18,8 +18,6 @@
  */
 class BoldStorefrontClient implements ClientInterface
 {
-    public const URL = 'https://api.boldcommerce.com/checkout/storefront/';
-
     /**
      * @var ConfigInterface
      */
@@ -172,13 +170,14 @@ private function getHeaders(): array
      * @return string
      * @throws LocalizedException
      */
-    private function getUrl(int $websiteId, string $path): string
+    public function getUrl(int $websiteId, string $path): string
     {
+        $apiUrl = $this->config->getApiUrl($websiteId) . 'checkout/storefront/';
         $boldCheckoutData = $this->checkoutSession->getBoldCheckoutData();
         if (!$boldCheckoutData) {
             throw new LocalizedException(__('Bold Checkout data is not set.'));
         }
         $publicOrderId = $boldCheckoutData['data']['public_order_id'];
-        return self::URL . $this->config->getShopId($websiteId) . '/' . $publicOrderId . '/' . $path;
+        return $apiUrl . $this->config->getShopId($websiteId) . '/' . $publicOrderId . '/' . $path;
     }
 }
diff --git a/UI/Payment/ConfigProvider.php b/UI/Payment/ConfigProvider.php
@@ -5,7 +5,6 @@
 
 use Bold\Checkout\Api\Http\ClientInterface;
 use Bold\Checkout\Model\ConfigInterface;
-use Bold\Checkout\Model\Http\BoldStorefrontClient;
 use Bold\Checkout\Model\Payment\Gateway\Service;
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Checkout\Model\Session;
@@ -132,7 +131,7 @@ public function getConfig(): array
                 'publicOrderId' => $orderId,
                 'jwtToken' => $jwtToken,
                 'countries' => $this->getAllowedCountries(),
-                'url' => BoldStorefrontClient::URL . $shopId . '/' . $orderId . '/',
+                'url' => $this->client->getUrl($websiteId, ''),
             ],
         ];
     }
@@ -149,7 +148,6 @@ private function getIframeSrc(): ?string
             return null;
         }
         $websiteId = (int)$this->storeManager->getWebsite()->getId();
-        $shopId = $this->config->getShopId($websiteId);
         try {
             $styles = $this->getStyles();
             if ($styles) {
@@ -163,7 +161,7 @@ private function getIframeSrc(): ?string
         if (!$orderId || !$jwtToken) {
             return null;
         }
-        return BoldStorefrontClient::URL . $shopId . '/' . $orderId . '/payments/iframe?token=' . $jwtToken;
+        return $this->client->getUrl($websiteId, 'payments/iframe?token=' . $jwtToken);
     }
 
     /**