ACP2E-1215: Customer has no any vault token save, but vault payment method appears in admin checkout

- fix

Author: o-dubovyk

app/code/Magento/Payment/Test/Unit/Plugin/PaymentMethodProcessTest.php

@@ -13,8 +13,7 @@
         "magento/module-quote": "*",
         "magento/module-sales": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-vault": "*"
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Payment/composer.json

@@ -81,12 +81,4 @@
             <argument name="logger" xsi:type="object">Magento\Payment\Model\Method\VirtualLogger</argument>
         </arguments>
     </type>
-    <type name="Magento\Payment\Block\Form\Container">
-        <plugin name="PaymentMethodProcess" type="Magento\Payment\Plugin\PaymentMethodProcess"/>
-    </type>
-    <type name="Magento\Payment\Plugin\PaymentMethodProcess">
-        <arguments>
-            <argument name="braintreeCCVault" xsi:type="string">braintree_cc_vault</argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/Payment/etc/di.xml

@@ -5,38 +5,26 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Payment\Plugin;
+namespace Magento\Vault\Plugin;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Block\Form\Container;
 use Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider;
+use Magento\Vault\Model\VaultPaymentInterface;
 
-/**
- * @SuppressWarnings(PHPMD)
- */
 class PaymentMethodProcess
 {
-    /**
-     * @var string
-     */
-    private string $braintreeCCVault;
-
     /**
      * @var TokensConfigProvider
      */
     private TokensConfigProvider $tokensConfigProvider;
 
     /**
-     * @param string $braintreeCCVault
-     * @param TokensConfigProvider|null $tokensConfigProvider
+     * @param TokensConfigProvider $tokensConfigProvider
      */
     public function __construct(
-        string $braintreeCCVault = '',
-        TokensConfigProvider $tokensConfigProvider = null
+        TokensConfigProvider $tokensConfigProvider
     ) {
-        $this->braintreeCCVault = $braintreeCCVault;
-        $this->tokensConfigProvider = $tokensConfigProvider ??
-            ObjectManager::getInstance()->get(TokensConfigProvider::class);
+        $this->tokensConfigProvider = $tokensConfigProvider;
     }
 
     /**
@@ -51,9 +39,8 @@ public function afterGetMethods(Container $container, array $results): array
     {
         $methods = [];
         foreach ($results as $result) {
-            if ($result->getCode() === $this->braintreeCCVault
-                && empty($this->tokensConfigProvider->getTokensComponents($result->getCode()))) {
-
+            if ($result instanceOf VaultPaymentInterface &&
+                empty($this->tokensConfigProvider->getTokensComponents($result->getCode()))) {
                 continue;
             }
             $methods[] = $result;

app/code/Magento/Payment/Plugin/PaymentMethodProcess.php renamed to app/code/Magento/Vault/Plugin/PaymentMethodProcess.php

@@ -57,4 +57,7 @@
         <plugin name="ProcessPaymentVaultInformationManagement"
                 type="Magento\Vault\Plugin\PaymentVaultInformationManagement"/>
     </type>
+    <type name="Magento\Payment\Block\Form\Container">
+        <plugin name="PaymentMethodProcess" type="Magento\Vault\Plugin\PaymentMethodProcess"/>
+    </type>
 </config>