MC-36554: Customer should be able to re-use the payflowPro_cc_vault as payment method for subsequent orders

- minor fixes

Author: Prabhu Ram

app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php

@@ -7,35 +7,41 @@
 
 namespace Magento\PaypalGraphQl\Model;
 
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
 
 /**
- * Get payment additional data for Payflow pro payment
+ * Get payment additional data for Payflow pro cc vault payment
  */
 class PayflowProCcVaultAdditionalDataProvider implements AdditionalDataProviderInterface
 {
-    private const PATH_ADDITIONAL_DATA = 'payflowpro_cc_vault';
+    const CC_VAULT_CODE = 'payflowpro_cc_vault';
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
     /**
-     * Format Payflow input into value expected when setting payment method
+     * @param ArrayManager $arrayManager
+     */
+    public function __construct(
+        ArrayManager $arrayManager
+    ) {
+        $this->arrayManager = $arrayManager;
+    }
+
+    /**
+     * Returns additional data
      *
      * @param array $args
      * @return array
      */
     public function getData(array $args): array
     {
-        if (!isset($args[self::PATH_ADDITIONAL_DATA])) {
-            throw new GraphQlInputException(
-                __('Required parameter "payflowpro_cc_vault" for "payment_method" is missing.')
-            );
+        if (isset($args[self::CC_VAULT_CODE])) {
+            return $args[self::CC_VAULT_CODE];
         }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['public_hash'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "public_hash" for "payflowpro_cc_vault" is missing.')
-            );
-        }
-
-        return $args[self::PATH_ADDITIONAL_DATA];
+        return [];
     }
 }

app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php

@@ -70,7 +70,10 @@ public function afterExecute(
         $additionalData = $this->additionalDataProviderPool->getData(self::CC_VAULT_CODE, $additionalData);
         $customerId = (int) $cart->getCustomer()->getId();
         $payment = $cart->getPayment();
-        if (!is_array($additionalData) || !isset($additionalData[PaymentTokenInterface::PUBLIC_HASH])) {
+        if (!is_array($additionalData)
+            || !isset($additionalData[PaymentTokenInterface::PUBLIC_HASH])
+            || $customerId === 0
+        ) {
             return;
         }
         $tokenPublicHash = $additionalData[PaymentTokenInterface::PUBLIC_HASH];

app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php

@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote\Payment;
 
 /**
  * Class PayflowProSetCcData set CcData to quote payment
@@ -50,21 +51,23 @@ public function execute(Observer $observer)
     {
         $dataObject = $this->readDataArgument($observer);
         $additionalData = $dataObject->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        /**
+         * @var Payment $paymentModel
+         */
         $paymentModel = $this->readPaymentModelArgument($observer);
+        $customerId = (int)$paymentModel->getQuote()->getCustomer()->getId();
 
         if (!isset($additionalData['cc_details'])) {
             return;
         }
 
-        if ($this->isPayflowProVaultEnable()) {
-            if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
-                $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
+        if ($this->isPayflowProVaultEnable() && $customerId !== 0) {
+            if (isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
+                $paymentModel->setData(
+                    self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER,
+                    $additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER]
+                );
             }
-
-            $paymentModel->setData(
-                self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER,
-                $additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER]
-            );
         } else {
             $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
         }