Merge pull request #95 from JerrySmidt/master

3.4.0

Author: JerrySmidt

Block/Onepage/LayoutProcessor.php

@@ -5,10 +5,12 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Exception\LocalizedException;
 
 class LayoutProcessor extends AbstractBlock implements LayoutProcessorInterface
 {
     protected $scopeConfig;
+    protected $jsLayout;
 
     /**
      * Constructor
@@ -32,22 +34,25 @@ public function __construct(Context $context, array $data = [])
      * @param mixed $jsLayout
      * @return array
      */
-    public function process($jsLayout)
+    public function process($jsLayout): array
     {
         $moduleEnabled = $this->scopeConfig->getValue('postcodenl_api/general/enabled', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
 
         if (!$moduleEnabled) {
             return $jsLayout;
         }
 
-        // Shipping fields
-        $shippingFields = &$jsLayout['components']
-            ['checkout']['children']
-            ['steps']['children']
-            ['shipping-step']['children']
-            ['shippingAddress']['children']
-            ['shipping-address-fieldset']['children'];
+        $this->jsLayout = $jsLayout;
 
+        // Shipping fields
+        $shippingFields = &$this->_getJsLayoutRef([
+            'components',
+            'checkout', 'children',
+            'steps', 'children',
+            'shipping-step', 'children',
+            'shippingAddress', 'children',
+            'shipping-address-fieldset', 'children'
+        ]);
         $shippingFields = $this->_changeAddressFieldsPosition($shippingFields);
 
         // Autofill fields copy
@@ -62,12 +67,18 @@ public function process($jsLayout)
         );
 
         // Billing step
-        $billingConfiguration = &$jsLayout['components']
-            ['checkout']['children']
-            ['steps']['children']
-            ['billing-step']['children']
-            ['payment']['children']
-            ['payments-list']['children'];
+        try {
+            $billingConfiguration = &$this->_getJsLayoutRef([
+                'components',
+                'checkout', 'children',
+                'steps', 'children',
+                'billing-step', 'children',
+                'payment', 'children',
+                'payments-list', 'children',
+            ]);
+        } catch (LocalizedException $e) {
+
+        }
 
         if (isset($billingConfiguration)) {
             foreach ($billingConfiguration as $key => &$billingForm) {
@@ -88,14 +99,20 @@ public function process($jsLayout)
         }
 
         // Billing address on payment page
-        $billingFields = &$jsLayout['components']
-            ['checkout']['children']
-            ['steps']['children']
-            ['billing-step']['children']
-            ['payment']['children']
-            ['afterMethods']['children']
-            ['billing-address-form']['children']
-            ['form-fields']['children'];
+        try {
+            $billingFields = &$this->_getJsLayoutRef([
+                'components',
+                'checkout', 'children',
+                'steps', 'children',
+                'billing-step', 'children',
+                'payment', 'children',
+                'afterMethods', 'children',
+                'billing-address-form', 'children',
+                'form-fields', 'children',
+            ]);
+        } catch (LocalizedException $e) {
+
+        }
 
         if (isset($billingFields)) {
             $billingFields += $this->_updateCustomScope($autofillFields, 'billingAddressshared');
@@ -104,20 +121,47 @@ public function process($jsLayout)
         }
 
         // Compatibility
-        $magePlazaBillingFields = &$jsLayout['components']
-            ['checkout']['children']
-            ['steps']['children']
-            ['shipping-step']['children']
-            ['billingAddress']['children']
-            ['billing-address-fieldset']['children'];
+        try {
+            $magePlazaBillingFields = &$this->_getJsLayoutRef([
+                'components',
+                'checkout', 'children',
+                'steps', 'children',
+                'shipping-step', 'children',
+                'billingAddress', 'children',
+                'billing-address-fieldset', 'children',
+            ]);
+        } catch (LocalizedException $e) {
+
+        }
 
         if (isset($magePlazaBillingFields)) {
             $magePlazaBillingFields += $this->_updateCustomScope($autofillFields, 'billingAddress');
             $magePlazaBillingFields = $this->_updateDataScope($magePlazaBillingFields, 'billingAddress');
             $magePlazaBillingFields = $this->_changeAddressFieldsPosition($magePlazaBillingFields);
         }
 
-        return $jsLayout;
+        return $this->jsLayout;
+    }
+
+    /**
+     * Get a reference to the specified path in $this->jsLayout.
+     *
+     * @param array $path - Path in Javascript layout.
+     * @return array - Reference to path in $this->jsLayout.
+     * @throws LocalizedException - Throw exception if path wasn't found.
+     */
+    private function &_getJsLayoutRef(array $path): array
+    {
+        $result = &$this->jsLayout;
+        foreach ($path as $key) {
+            if (isset($result[$key])) {
+                $result = &$result[$key];
+            } else {
+                throw new LocalizedException(__('Invalid path in Javascript layout: `%1`', implode('.', $path)));
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -128,7 +172,7 @@ public function process($jsLayout)
      * @param string $dataScope
      * @return array - Fields with modified customScope.
      */
-    private function _updateCustomScope($fields, $dataScope)
+    private function _updateCustomScope($fields, $dataScope): array
     {
         foreach ($fields as $name => $items) {
             if (isset($items['config'], $items['config']['customScope'])) {
@@ -153,7 +197,7 @@ private function _updateCustomScope($fields, $dataScope)
      * @param string $dataScope
      * @return array - Fields with modified customScope.
      */
-    private function _updateDataScope($fields, $dataScope)
+    private function _updateDataScope($fields, $dataScope): array
     {
         foreach ($fields as $name => $items) {
             if (isset($items['dataScope'])) {
@@ -175,7 +219,7 @@ private function _updateDataScope($fields, $dataScope)
      * @param array $addressFields
      * @return array
      */
-    private function _changeAddressFieldsPosition($addressFields)
+    private function _changeAddressFieldsPosition($addressFields): array
     {
         if ($this->scopeConfig->getValue('postcodenl_api/general/change_fields_position') != '1') {
             return $addressFields;

GraphQl/Exception/GraphQlHeaderException.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Flekto\Postcode\GraphQl\Exception;
+
+use GraphQL\Error\ClientAware;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Exception for GraphQL to be thrown when user supplies an invalid header
+ */
+class GraphQlHeaderException extends LocalizedException implements ClientAware
+{
+    /**
+     * Describing a category of the error
+     */
+    const EXCEPTION_CATEGORY = 'graphql-header';
+
+    /**
+     * @var boolean
+     */
+    private $isSafe;
+
+    /**
+     * @param Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     * @param boolean $isSafe
+     */
+    public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0, $isSafe = true)
+    {
+        $this->isSafe = $isSafe;
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isClientSafe(): bool
+    {
+        return $this->isSafe;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCategory(): string
+    {
+        return self::EXCEPTION_CATEGORY;
+    }
+}