Update captcha validation

Model/Client/Request/PaymentIntents/Get.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * This file is part of the Airwallex Payments module.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade
+ * to newer versions in the future.
+ *
+ * @copyright Copyright (c) 2021 Magebit, Ltd. (https://magebit.com/)
+ * @license   GNU General Public License ("GPL") v3.0
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace Airwallex\Payments\Model\Client\Request\PaymentIntents;
+
+use Airwallex\Payments\Model\Client\AbstractClient;
+use Airwallex\Payments\Model\Client\Interfaces\BearerAuthenticationInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class Get extends AbstractClient implements BearerAuthenticationInterface
+{
+    /**
+     * @var string
+     */
+    private string $paymentIntentId;
+
+    /**
+     * @param string $id
+     *
+     * @return $this
+     */
+    public function setPaymentIntentId(string $id): self
+    {
+        $this->paymentIntentId = $id;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getUri(): string
+    {
+        return 'pa/payment_intents/' . $this->paymentIntentId;
+    }
+
+    /**
+     * @param ResponseInterface $request
+     *
+     * @return string
+     * @throws \JsonException
+     */
+    protected function parseResponse(ResponseInterface $request): string
+    {
+        return $request->getBody()->getContents();
+    }
+
+    /**
+     * @return string
+     */
+    protected function getMethod(): string
+    {
+        return 'GET';
+    }
+}

Model/Config/WebapiConfigProvider.php

@@ -31,8 +31,8 @@
 class WebapiConfigProvider implements WebapiValidationConfigProviderInterface
 {
     const PROTECTED_METHODS = [
-        'guestSavePaymentInformationAndPlaceOrder' => true,
-        'savePaymentInformationAndPlaceOrder' => true
+        'airwallexGuestPlaceOrder' => true,
+        'airwallexPlaceOrder' => true
     ];
     protected IsCaptchaEnabledInterface $isEnabled;
     protected ValidationConfigResolverInterface $configResolver;

Model/Service.php

@@ -34,6 +34,7 @@
 use Magento\Payment\Model\MethodInterface;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Airwallex\Payments\Model\Client\Request\PaymentIntents\Get;
 
 class Service implements ServiceInterface
 {
@@ -44,6 +45,7 @@ class Service implements ServiceInterface
     protected PaymentInformationManagementInterface $paymentInformationManagement;
     protected PlaceOrderResponseInterfaceFactory $placeOrderResponseFactory;
     protected CacheInterface $cache;
+    protected Get $intentGet;
 
     /**
      * Index constructor.
@@ -63,7 +65,8 @@ public function __construct(
         GuestPaymentInformationManagementInterface $guestPaymentInformationManagement,
         PaymentInformationManagementInterface $paymentInformationManagement,
         PlaceOrderResponseInterfaceFactory $placeOrderResponseFactory,
-        CacheInterface $cache
+        CacheInterface $cache,
+        Get $intentGet
     ) {
         $this->paymentIntents = $paymentIntents;
         $this->configuration = $configuration;
@@ -72,6 +75,7 @@ public function __construct(
         $this->paymentInformationManagement = $paymentInformationManagement;
         $this->placeOrderResponseFactory = $placeOrderResponseFactory;
         $this->cache = $cache;
+        $this->intentGet = $intentGet;
     }
 
     /**
@@ -138,6 +142,7 @@ public function airwallexGuestPlaceOrder(
                 'client_secret' => $intent['clientSecret']
             ]);
         } else {
+            $this->checkIntent($intentId);
             $orderId = $this->guestPaymentInformationManagement->savePaymentInformationAndPlaceOrder(
                 $cartId,
                 $email,
@@ -169,6 +174,7 @@ public function airwallexPlaceOrder(
     ): PlaceOrderResponseInterface {
         /** @var PlaceOrderResponse $response */
         $response = $this->placeOrderResponseFactory->create();
+
         if ($intentId === null) {
             $intent = $this->paymentIntents->getIntents();
             $this->cache->save(1, ReCaptchaValidationPlugin::getCacheKey($intent['id']), [], 3600);
@@ -179,6 +185,7 @@ public function airwallexPlaceOrder(
                 'client_secret' => $intent['clientSecret']
             ]);
         } else {
+            $this->checkIntent($intentId);
             $orderId = $this->paymentInformationManagement->savePaymentInformationAndPlaceOrder(
                 $cartId,
                 $paymentMethod,
@@ -193,4 +200,14 @@ public function airwallexPlaceOrder(
 
         return $response;
     }
+
+    protected function checkIntent($id)
+    {
+        $resp = $this->intentGet->setPaymentIntentId($id)->send();
+
+        $respArr = json_decode($resp, true);
+        if (!in_array($respArr['status'],["SUCCEEDED","REQUIRES_CAPTURE"])) {
+            throw new \Exception("Something went wrong while processing your request. Please try again later.");
+        }
+    }
 }