Remove Controller Quote Restoration Logic and harden the guard in web…

…hook handling when validation fails (#196)
rvvup · Oct 10, 2024 · 342debc · 342debc
1 parent 48babfd
commit 342debc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 96 deletions.
diff --git a/Controller/Redirect/In.php b/Controller/Redirect/In.php
@@ -152,6 +152,10 @@ public function execute()
                     true
                 );
             }
+            return $this->resultFactory->create(ResultFactory::TYPE_REDIRECT)->setPath(
+                In::FAILURE,
+                ['_secure' => true, '_fragment' => 'payment']
+            );
         }
 
         $payment = $quote->getPayment();

diff --git a/Model/Queue/Handler/Handler.php b/Model/Queue/Handler/Handler.php
@@ -17,11 +17,11 @@
 use Rvvup\Payments\Gateway\Method;
 use Rvvup\Payments\Model\Payment\PaymentDataGetInterface;
 use Rvvup\Payments\Model\ProcessOrder\ProcessorPool;
+use Rvvup\Payments\Model\Queue\QueueContextCleaner;
 use Rvvup\Payments\Model\RvvupConfigProvider;
 use Rvvup\Payments\Model\Webhook\WebhookEventType;
 use Rvvup\Payments\Service\Cache;
 use Rvvup\Payments\Service\Capture;
-use Rvvup\Payments\Model\Queue\QueueContextCleaner;
 
 class Handler
 {
@@ -187,12 +187,7 @@ public function execute(string $data)
                 $lastTransactionId = (string)$payment->getAdditionalInformation(Method::TRANSACTION_ID);
                 $validate = $this->captureService->validate($quote, $rvvupOrderId, null, $origin);
                 if (!$validate->getIsValid()) {
-                    if ($validate->getRedirectToCart()) {
-                        return;
-                    }
-                    if ($validate->getAlreadyExists()) {
-                        return;
-                    }
+                    return;
                 }
                 $this->captureService->setCheckoutMethod($quote);
                 $validation = $this->captureService->createOrder($rvvupOrderId, $quote, $origin);

diff --git a/Observer/Restore.php b/Observer/Restore.php
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -71,16 +71,6 @@
             <argument name="logger" xsi:type="object">Rvvup\Payments\Model\Logger</argument>
         </arguments>
     </type>
-    <type name="Rvvup\Payments\Observer\Restore">
-        <arguments>
-            <argument name="restrictedPaths" xsi:type="array">
-                <item name="captcha" xsi:type="string">captcha/refresh</item>
-                <item name="customer_section" xsi:type="string">customer/section/load</item>
-                <item name="rvvup" xsi:type="string">rvvup/redirect/in</item>
-            </argument>
-            <argument name="session" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
-        </arguments>
-    </type>
     <!-- View Models -->
     <type name="Rvvup\Payments\ViewModel\Clearpay">
         <arguments>

diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
@@ -5,9 +5,6 @@
         <observer name="rvvup_payments_checkout_cart_restrictions_warning"
                   instance="Rvvup\Payments\Observer\CartRestrictionsWarning" />
     </event>
-    <event name="controller_action_predispatch">
-        <observer name="rvvup_payments_reload_cart_data" instance="Rvvup\Payments\Observer\Restore" />
-    </event>
     <!-- Remove express payment data when a quote is restored (payment cancelled/rejected etc) -->
     <event name="restore_quote">
         <observer name="Rvvup_Payments::Observer\Session\RemoveExpressPaymentDataObserver"