Use plugin for checking is customer logged

Author: Usik2203

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

@@ -8,6 +8,7 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -47,6 +48,7 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
+     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -55,7 +57,8 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData
+        array $paymentData,
+        ContextInterface $context
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_HOSTEDPRO, $paymentData);
 

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

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Paypal\Model\Config;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
+use Magento\Sales\Model\Order\Payment\Repository as PaymentRepository;
+use Magento\PaypalGraphQl\Observer\PayflowProSetCcData;
+
+/**
+ * Set additionalInformation on payment for PayflowPro method
+ */
+class SetPaymentMethodOnCart
+{
+    /**
+     * @var PaymentRepository
+     */
+    private $paymentRepository;
+
+    /**
+     * @var AdditionalDataProviderPool
+     */
+    private $additionalDataProviderPool;
+
+    /**
+     * @param PaymentRepository $paymentRepository
+     * @param AdditionalDataProviderPool $additionalDataProviderPool
+     */
+    public function __construct(
+        PaymentRepository $paymentRepository,
+        AdditionalDataProviderPool $additionalDataProviderPool
+    ) {
+        $this->paymentRepository = $paymentRepository;
+        $this->additionalDataProviderPool = $additionalDataProviderPool;
+    }
+
+    /**
+     * Set redirect URL paths on payment additionalInformation
+     *
+     * @param \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject
+     * @param mixed $result
+     * @param Quote $cart
+     * @param array $paymentData
+     * @return void
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(
+        \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
+        $result,
+        Quote $cart,
+        array $paymentData,
+        ContextInterface $context
+    ): void {
+        $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_PAYFLOWPRO, $paymentData);
+
+        if (!$context->getExtensionAttributes()->getIsCustomer()
+            && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
+            $payment = $cart->getPayment();
+            $payment->unsAdditionalInformation(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER);
+            $payment->save();
+        }
+    }
+}

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

@@ -8,7 +8,6 @@
 
 namespace Magento\PaypalGraphQl\Observer;
 
-use Magento\Customer\Model\Session as CustomerModelSession;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -24,11 +23,6 @@ class PayflowProSetCcData extends AbstractDataAssignObserver
     const XML_PATH_PAYMENT_PAYFLOWPRO_CC_VAULT_ACTIVE = "payment/payflowpro_cc_vault/active";
     const IS_ACTIVE_PAYMENT_TOKEN_ENABLER = "is_active_payment_token_enabler";
 
-    /**
-     * @var CustomerModelSession
-     */
-    private $customerSession;
-
     /**
      * Core store config
      *
@@ -37,14 +31,11 @@ class PayflowProSetCcData extends AbstractDataAssignObserver
     private $scopeConfig;
 
     /**
-     * @param CustomerModelSession $customerSession
      * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        CustomerModelSession $customerSession,
         ScopeConfigInterface $scopeConfig
     ) {
-        $this->customerSession = $customerSession;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -65,11 +56,9 @@ public function execute(Observer $observer)
             return;
         }
 
-        if ($this->customerSession->isLoggedIn() && $this->isPayflowProVaultEnable()) {
+        if ($this->isPayflowProVaultEnable()) {
             if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
-                throw new GraphQlInputException(
-                    __('Required parameter "is_active_payment_token_enabler" is missing.')
-                );
+                $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
             }
 
             $paymentModel->setData(

app/code/Magento/PaypalGraphQl/composer.json

@@ -13,8 +13,7 @@
         "magento/module-quote-graph-ql": "*",
         "magento/module-sales": "*",
         "magento/module-payment": "*",
-        "magento/module-store": "*",
-        "magento/module-customer": "*"
+        "magento/module-store": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"

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

@@ -12,6 +12,9 @@
     <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
         <plugin name="hosted_pro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro\SetPaymentMethodOnCart"/>
     </type>
+    <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
+        <plugin name="payflowpro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro\SetPaymentMethodOnCart"/>
+    </type>
     <type name="Magento\Paypal\Model\Payflowlink">
         <plugin name="payflow_link_update_redirect_urls" type="Magento\PaypalGraphQl\Model\Plugin\Payflowlink"/>
     </type>

app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -57,10 +58,12 @@ public function __construct(
      *
      * @param Quote $cart
      * @param array $paymentData
+     * @param ContextInterface $context
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(Quote $cart, array $paymentData): void
+    public function execute(Quote $cart, array $paymentData, ContextInterface $context): void
     {
         if (!isset($paymentData['code']) || empty($paymentData['code'])) {
             throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));

app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php

@@ -68,7 +68,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
-        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
+        $this->setPaymentMethodOnCart->execute($cart, $paymentData, $context);
 
         return [
             'cart' => [