Merge pull request #1 from experius/bugfix/SEL-643_catch-postcode-errors

[BUGFIX][SEL-643] Catch postcode errors instead of serving server errors

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.2 (2021-11-19)
+
+[View Release]([email protected]:experius/Mage2-Module-Experius-PostcodeGraphQl.git/commits/tag/2.0.2)
+
+*  [BUGFIX][SEL-643] Catch postcode errors instead of serving server errors *(Matthijs Breed)*
+
+
 ## 2.0.1 (2021-09-28)
 
 [View Release]([email protected]:experius/Mage2-Module-Experius-PostcodeGraphQl.git/commits/tag/2.0.1)

Model/Resolver/Postcode.php

@@ -13,6 +13,7 @@
 namespace Experius\PostcodeGraphQl\Model\Resolver;
 
 use Experius\Core\Helper\Settings;
+use Flekto\Postcode\Helper\Exception\ClientException;
 use Flekto\Postcode\Helper\PostcodeApiClient;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -60,10 +61,12 @@ public function resolve(
             $args['houseNumberAddition'] = '';
         }
 
-        $result = $this->postcodeHelper->dutchAddressByPostcode($args['postcode'], $args['houseNumber'], $args['houseNumberAddition']);
-        if (isset($result['message'])) {
-            throw new GraphQlInputException($result['message']);
+        try {
+            $result = $this->postcodeHelper->dutchAddressByPostcode($args['postcode'], $args['houseNumber'], $args['houseNumberAddition']);
+        } catch (ClientException $e) {
+            throw new GraphQlInputException(__($e->getMessage()));
         }
+
         return $result;
     }
 }