Generate a fresh formkey at result build

ProxiBlue · Apr 2, 2022 · 50737ed · 50737ed
1 parent 4d09665
commit 50737ed
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 10 deletions.
diff --git a/LICENCE b/LICENCE
diff --git a/Plugin/ItemFactory.php b/Plugin/ItemFactory.php
@@ -3,38 +3,59 @@
 namespace ProxiBlue\HyvaSmileAutocompleteAddToCart\Plugin;
 
 use Magento\Checkout\Helper\Cart as CartHelper;
+use Magento\Framework\Data\Form\FormKey;
+
+// phpcs:disable Generic.Files.LineLength.TooLong
 
 class ItemFactory
 {
 
     /**
+     * Cart helper to get add to cart url
+     *
      * @var CartHelper
      */
     protected $cartHelper;
 
     /**
+     * Generate an up-to-date form key
+     *
+     * @var FormKey
+     */
+    protected $formKey;
+
+    /**
+     * Constructor
+     *
      * @param CartHelper $cartHelper
+     * @param FormKey $formKey
      */
     public function __construct(
-        CartHelper $cartHelper
+        CartHelper $cartHelper,
+        FormKey    $formKey
     ) {
-        $this->cartHelper             = $cartHelper;
+        $this->cartHelper = $cartHelper;
+        $this->formKey = $formKey;
     }
 
     /**
      * Inject the add to cart url here
      *
-     * @param \Smile\ElasticsuiteCatalog\Model\Autocomplete\Product\ItemFactory $subject
-     * @param callable $proceed
-     * @param $data
-     * @return mixed
+     * @param \Smile\ElasticsuiteCatalog\Model\Autocomplete\Product\ItemFactory $subject Object
+     * @param array                                                             $data    Array of values
+     *
+     * @return array
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function beforeCreate(\Smile\ElasticsuiteCatalog\Model\Autocomplete\Product\ItemFactory $subject, $data)
+    public function beforeCreate(\Smile\ElasticsuiteCatalog\Model\Autocomplete\Product\ItemFactory $subject, array $data)
     {
         if ($data['product']
             && $data['product']->isSaleable()
-            && $data['product']->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE) {
-            $data['add_url'] = $this->cartHelper->getAddUrl($data['product'], ['useUencPlaceholder'=>true]);
+            && $data['product']->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+        ) {
+            $data['add_url'] = $this->cartHelper->getAddUrl($data['product'], ['useUencPlaceholder' => true]);
+            $data['formkey'] = $this->formKey->getFormKey();
             $data['type'] = 'product_add_to_cart';
         }
 

diff --git a/view/frontend/templates/catalog/autocomplete/product_add_to_cart.phtml b/view/frontend/templates/catalog/autocomplete/product_add_to_cart.phtml
@@ -10,11 +10,14 @@ declare(strict_types=1);
 
 use Hyva\Theme\Model\ViewModelRegistry;
 use Hyva\Theme\ViewModel\HeroiconsOutline;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Template;
 
 // phpcs:disable Generic.Files.LineLength.TooLong
 
 /** @var ViewModelRegistry $viewModels */
 /** @var Escaper $escaper */
+/** @var Template $block */
 
 /** @var HeroiconsOutline $heroiconsOutline */
 $heroiconsOutline = $viewModels->require(HeroiconsOutline::class);
@@ -34,7 +37,7 @@ $heroiconsOutline = $viewModels->require(HeroiconsOutline::class);
             <div class="col-span-2 content-end items-end">
                 <form method="post"
                       x-bind:action="searchResult.add_url">
-                    <?= /** @noEscape */ $block->getBlockHtml('formkey') ?>
+                    <input name="form_key" type="hidden" x-bind:value="searchResult.formkey">
                     <button class="btn btn-primary"
                             aria-label="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
                     >