MC-17411: Add plugins/update existing ones to support the Payflow Pro

- review comments

Author: Prabhu Ram

app/code/Magento/PaypalGraphQl/Model/PaypalAdditionalDataProvider.php renamed to app/code/Magento/PaypalGraphQl/Model/PayflowProAdditionalDataProvider.php

@@ -9,15 +9,14 @@
 
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
+use Magento\Paypal\Model\Config;
 
 /**
- * Get payment additional data for Paypal Express payment
+ * Get payment additional data for Payflow pro payment
  */
-class PaypalAdditionalDataProvider implements AdditionalDataProviderInterface
+class PayflowProAdditionalDataProvider implements AdditionalDataProviderInterface
 {
 
-    private const PATH_ADDITIONAL_DATA = 'input/payment_method/additional_data';
-
     /**
      * @var ArrayManager
      */
@@ -40,8 +39,9 @@ public function __construct(
      */
     public function getData(array $args): array
     {
-        $additionalData = $this->arrayManager->get(self::PATH_ADDITIONAL_DATA, $args) ?? [];
-
-        return $additionalData;
+        if (isset($args[Config::METHOD_PAYFLOWPRO])) {
+            return $args[Config::METHOD_PAYFLOWPRO];
+        }
+        return [];
     }
 }

app/code/Magento/PaypalGraphQl/Model/Plugin/Resolver/SetPaymentMethodOnCart.php

@@ -14,7 +14,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Paypal\Model\Express\Checkout\Factory as CheckoutFactory;
-use Magento\PaypalGraphQl\Model\PaypalAdditionalDataProvider;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\PaypalGraphQl\Model\Provider\Checkout as CheckoutProvider;
 use Magento\PaypalGraphQl\Model\Provider\Config as ConfigProvider;
@@ -26,18 +25,15 @@ class SetPaymentMethodOnCart
 {
     private const PATH_CODE = 'input/payment_method/code';
 
+    private const PATH_ADDITIONAL_DATA = 'input/payment_method/additional_data';
+
     private $allowedPaymentMethodCodes = [];
 
     /**
      * @var CheckoutFactory
      */
     private $checkoutFactory;
 
-    /**
-     * @var PaypalAdditionalDataProvider
-     */
-    private $paypalAdditionalDataProvider;
-
     /**
      * @var ArrayManager
      */
@@ -55,22 +51,19 @@ class SetPaymentMethodOnCart
 
     /**
      * @param CheckoutFactory $checkoutFactory
-     * @param PaypalAdditionalDataProvider $paypalAdditionalDataProvider
      * @param ArrayManager $arrayManager
      * @param CheckoutProvider $checkoutProvider
      * @param ConfigProvider $configProvider
      * @param array $allowedPaymentMethodCodes
      */
     public function __construct(
         CheckoutFactory $checkoutFactory,
-        PaypalAdditionalDataProvider $paypalAdditionalDataProvider,
         ArrayManager $arrayManager,
         CheckoutProvider $checkoutProvider,
         ConfigProvider $configProvider,
         array $allowedPaymentMethodCodes = []
     ) {
         $this->checkoutFactory = $checkoutFactory;
-        $this->paypalAdditionalDataProvider = $paypalAdditionalDataProvider;
         $this->arrayManager = $arrayManager;
         $this->checkoutProvider = $checkoutProvider;
         $this->configProvider = $configProvider;
@@ -105,7 +98,7 @@ public function afterResolve(
             return $resolvedValue;
         }
 
-        $paypalAdditionalData = $this->paypalAdditionalDataProvider->getData($args);
+        $paypalAdditionalData = $this->arrayManager->get(self::PATH_ADDITIONAL_DATA, $args) ?? [];
         $payerId = $paypalAdditionalData[$paymentCode]['payer_id'] ?? null;
         $token = $paypalAdditionalData[$paymentCode]['token'] ?? null;
         $cart = $resolvedValue['cart']['model'];

app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Stdlib\Parameters;
+use Magento\Framework\DataObjectFactory;
 
 /**
  * Resolver for handling PayflowPro response
@@ -62,13 +63,20 @@ class PayflowProResponse implements ResolverInterface
     private $parameters;
 
     /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * PayflowProResponse constructor.
      * @param Transaction $transaction
      * @param ResponseValidator $responseValidator
      * @param PaymentFailuresInterface $paymentFailures
      * @param Json $json
      * @param Transparent $transparent
      * @param GetCartForUser $getCartForUser
      * @param Parameters $parameters
+     * @param DataObjectFactory $dataObjectFactory
      */
     public function __construct(
         Transaction $transaction,
@@ -77,7 +85,8 @@ public function __construct(
         Json $json,
         Transparent $transparent,
         GetCartForUser $getCartForUser,
-        Parameters $parameters
+        Parameters $parameters,
+        DataObjectFactory $dataObjectFactory
     ) {
         $this->transaction = $transaction;
         $this->responseValidator = $responseValidator;
@@ -86,6 +95,7 @@ public function __construct(
         $this->transparent = $transparent;
         $this->getCartForUser = $getCartForUser;
         $this->parameters = $parameters;
+        $this->dataObjectFactory = $dataObjectFactory;
     }
 
     /**
@@ -115,7 +125,7 @@ public function resolve(
         $this->parameters->fromString(urldecode($paypalPayload));
         $data = $this->parameters->toArray();
         try {
-            $do = new \Magento\Framework\DataObject(array_change_key_case($data, CASE_LOWER));
+            $do = $this->dataObjectFactory->create(['data' => array_change_key_case($data, CASE_LOWER)]);
             $this->responseValidator->validate($do, $this->transparent);
             $this->transaction->savePaymentInQuote($do, $cart->getId());
         } catch (LocalizedException $exception) {

app/code/Magento/PaypalGraphQl/etc/graphql/di.xml

@@ -39,7 +39,7 @@
     <type name="Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool">
         <arguments>
             <argument name="dataProviders" xsi:type="array">
-                <item name="payflowpro" xsi:type="object">\Magento\PaypalGraphQl\Model\PaypalAdditionalDataProvider</item>
+                <item name="payflowpro" xsi:type="object">\Magento\PaypalGraphQl\Model\PayflowProAdditionalDataProvider</item>
             </argument>
         </arguments>
     </type>