fix: exceptions on cdek server unavailable

cdek-it · Nov 27, 2024 · cbac468 · cbac468
1 parent 61646cf
commit cbac468
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/src/Actions/CalculateDeliveryAction.php b/src/Actions/CalculateDeliveryAction.php
@@ -36,7 +36,7 @@ public function __invoke(array $package, int $instanceID, bool $addTariffsToOffi
             $this->method = ShippingMethod::factory($instanceID);
             $api          = new CdekApi($instanceID);
 
-            if (empty($this->method->city_code) || !$api->checkAuth()) {
+            if (empty($this->method->city_code) || $api->authGetError() !== null) {
                 return [];
             }
 

diff --git a/src/Blocks/AdminOrderBox.php b/src/Blocks/AdminOrderBox.php
@@ -93,7 +93,7 @@ public static function registerMetaBoxes(string $_post_type, $post): void
 
             add_action('admin_enqueue_scripts', [__CLASS__, 'registerOrderScripts']);
 
-            if (!(new CdekApi($shipping->getInstanceId()))->checkAuth()) {
+            if ((new CdekApi($shipping->getInstanceId()))->authGetError() !== null) {
                 add_meta_box(
                     Config::ORDER_META_BOX_KEY,
                     Loader::getPluginName(),

diff --git a/src/Blocks/CheckoutMapBlock.php b/src/Blocks/CheckoutMapBlock.php
@@ -14,6 +14,7 @@
     use Automattic\WooCommerce\StoreApi\Schemas\V1\CheckoutSchema;
     use Cdek\CdekApi;
     use Cdek\Config;
+    use Cdek\Contracts\ExceptionContract;
     use Cdek\Helpers\CheckoutHelper;
     use Cdek\Helpers\UI;
     use Cdek\Model\Order;
@@ -54,7 +55,11 @@ public static function extend_cart_data(): array
 
             $api = new CdekApi;
 
-            $city = $api->cityCodeGet($cityInput, $postcodeInput);
+            try {
+                $city = $api->cityCodeGet($cityInput, $postcodeInput);
+            } catch (ExceptionContract $e) {
+                $city = null;
+            }
 
             return [
                 'inputs' => [

diff --git a/src/CdekApi.php b/src/CdekApi.php
@@ -129,14 +129,14 @@ public function calculateList(array $deliveryParam): array
             )->json();
         }
 
-        public function checkAuth(): bool
+        public function authGetError(): ?string
         {
             try {
-                $this->tokenStorage->getToken();
+                $this->fetchToken();
 
-                return true;
+                return null;
             } catch (LegacyAuthException $e) {
-                return false;
+                return $e->getData()['code'] ?? $e->getData()['error'] ?? 'unknown';
             }
         }
 

diff --git a/src/ShippingMethod.php b/src/ShippingMethod.php
@@ -173,13 +173,26 @@ public function __isset(string $key): bool
 
         final public function admin_options(): void
         {
-            if (!(new CdekApi)->checkAuth()) {
-                WC_Admin_Settings::add_error(
-                    esc_html__(
-                        'Error receiving token from CDEK API. Make sure the integration keys are correct',
-                        'cdekdelivery',
-                    ),
-                );
+            $error = (new CdekApi)->authGetError();
+            if ($error !== null) {
+                if ($error === 'invalid_client') {
+                    WC_Admin_Settings::add_error(
+                        esc_html__(
+                            'Error receiving token from CDEK API. Make sure the integration keys are correct',
+                            'cdekdelivery',
+                        ),
+                    );
+                } else {
+                    WC_Admin_Settings::add_error(
+                        sprintf(
+                            esc_html__(
+                                'Error receiving token from CDEK API. Contact plugin support. Error code: %s',
+                                'cdekdelivery',
+                            ),
+                            $error,
+                        ),
+                    );
+                }
                 WC_Admin_Settings::show_messages();
             }
 

diff --git a/src/Transport/HttpClient.php b/src/Transport/HttpClient.php
@@ -117,7 +117,7 @@ public static function tryGetRequesterIp(): ?string
             }
 
             if (!headers_sent()) {
-                header("X-Requester-IP: $ip");
+                header("X-Origin-IP: $ip");
             }
 
             return $ip;