[PW-7179] - Adjust vault tokenization functionality (#1709)

* PW-7179 - Re-add parent AdyenUiComponentProvider * PW-7179 - Check if property exists before checking type * PW-7179 - Fix issue created in merge commit and update PaymentVaultDeleteToken * PW-7179 - Do not show ApplePay and AmazonPay for now. Also add to do annotations for them * [PW-7157]Add India live prefix for frontend (#1708) * Add India live prefix for frontend * revert adyen-methods.js Co-authored-by: Jeantwan Teuma <Morerice@users.noreply.github.com> * PW-7179 - Move tooltip to comment * PW-7129: Remove full request/response logging (#1712) * PW-7129: Remove full request/response logging Add new log processors to help with troubleshooting. * PW-7129: Use context placeholders * Adding number format to getAmountIncludingTax in test (#1715) * Adding number format to getAmountIncludingTax in test * Apply number format on getTaxAmount Co-authored-by: Alexandros Moraitis <alexandros.moraitis@adyen.com> Co-authored-by: Michael Paul <michael.paul@adyen.com> Co-authored-by: Ángel Campos <angel.campos@adyen.com>
Adyen · Sep 20, 2022 · 9ec4f80 · 9ec4f80
1 parent 1794741
commit 9ec4f80
Show file tree

Hide file tree

Showing 16 changed files with 118 additions and 66 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -55,6 +55,7 @@ class Data extends AbstractHelper
     const LIVE = 'live';
     const LIVE_AU = 'live-au';
     const LIVE_US = 'live-us';
+    const LIVE_IN = 'live-in';
     const PSP_REFERENCE_REGEX = '/(?P<pspReference>[0-9.A-Z]{16})(?P<suffix>[a-z\-]*)/';
     const AFTERPAY = 'afterpay';
     const AFTERPAY_TOUCH = 'afterpaytouch';
@@ -286,7 +287,8 @@ public function getCheckoutFrontendRegions()
         return [
             'eu' => 'Default (EU - Europe)',
             'au' => 'AU - Australasia',
-            'us' => 'US - United States'
+            'us' => 'US - United States',
+            'in' => 'IN - India'
         ];
     }
 
@@ -1494,8 +1496,6 @@ public function initializeAdyenClient($storeId = null, $apiKey = null, $motoMerc
             $client->setEnvironment(\Adyen\Environment::LIVE, $this->getLiveEndpointPrefix($storeId));
         }
 
-        $client->setLogger($this->adyenLogger);
-
         return $client;
     }
 
@@ -1613,6 +1613,8 @@ public function getCheckoutEnvironment($storeId = null)
                 return self::LIVE_AU;
             case "us":
                 return self::LIVE_US;
+            case "in":
+                return self::LIVE_IN;
             default:
                 return self::LIVE;
         }

diff --git a/Helper/PaymentMethods/AmazonPayPaymentMethod.php b/Helper/PaymentMethods/AmazonPayPaymentMethod.php
@@ -12,7 +12,7 @@
 
 namespace Adyen\Payment\Helper\PaymentMethods;
 
-
+/** TODO: This PM can be enabled for recurring purposes once tested */
 class AmazonPayPaymentMethod extends AbstractWalletPaymentMethod
 {
     const TX_VARIANT = 'amazonpay';
@@ -40,16 +40,16 @@ public function supportsAutoCapture(): bool
 
     public function supportsCardOnFile(): bool
     {
-        return true;
+        return false;
     }
 
     public function supportsSubscription(): bool
     {
-        return true;
+        return false;
     }
 
     public function supportsUnscheduledCardOnFile(): bool
     {
-        return true;
+        return false;
     }
 }
diff --git a/Helper/PaymentMethods/ApplePayPaymentMethod.php b/Helper/PaymentMethods/ApplePayPaymentMethod.php
@@ -11,6 +11,7 @@
  */
 namespace Adyen\Payment\Helper\PaymentMethods;
 
+/** TODO: This PM can be enabled for recurring purposes once tested */
 class ApplePayPaymentMethod extends AbstractWalletPaymentMethod
 {
     const TX_VARIANT = 'applepay';
@@ -38,16 +39,16 @@ public function supportsAutoCapture(): bool
 
     public function supportsCardOnFile(): bool
     {
-        return true;
+        return false;
     }
 
     public function supportsSubscription(): bool
     {
-        return true;
+        return false;
     }
 
     public function supportsUnscheduledCardOnFile(): bool
     {
-        return true;
+        return false;
     }
 }
diff --git a/Helper/Webhook.php b/Helper/Webhook.php
@@ -162,7 +162,7 @@ public function processNotification(Notification $notification): bool
             $currentState = $this->getCurrentState($this->order->getState());
             if (!$currentState) {
                 $this->logger->addAdyenNotification(
-                    sprintf("ERROR: Unhandled order state '%s'.", $this->order->getState()),
+                    "ERROR: Unhandled order state '{orderState}'",
                     $this->logger->getOrderContext($this->order)
                 );
                 return false;

diff --git a/Helper/Webhook/CaptureWebhookHandler.php b/Helper/Webhook/CaptureWebhookHandler.php
@@ -105,7 +105,7 @@ public function handleWebhook(MagentoOrder $order, Notification $notification, s
 
             $magentoInvoice = $this->magentoInvoiceFactory->create()->load($adyenInvoice->getInvoiceId(), MagentoInvoice::ENTITY_ID);
             $this->adyenLogger->addAdyenNotification(
-                sprintf('Notification %s updated invoice %s.', $notification->getEntityId(), $magentoInvoice->getEntityid()),
+                sprintf('Notification %s updated invoice {invoiceId}', $notification->getEntityId()),
                 $this->adyenLogger->getInvoiceContext($magentoInvoice)
             );
 

diff --git a/Model/Comment/TokenizedPaymentMethods.php b/Model/Comment/TokenizedPaymentMethods.php
@@ -22,6 +22,6 @@ class TokenizedPaymentMethods implements CommentInterface
      */
     public function getCommentText($elementValue): string
     {
-        return 'Selected payment methods will automatically be tokenized on every transaction. At the moment, CardOnFile tokens can only be created using Wallet payment methods (Google Pay, Amazon Pay etc.).';
+        return 'Selected payment methods will automatically be tokenized on every transaction. At the moment, CardOnFile tokens can only be created using Wallet payment methods (Google Pay).';
     }
 }
diff --git a/Model/Config/Source/TokenizedPaymentMethods.php b/Model/Config/Source/TokenizedPaymentMethods.php
@@ -13,14 +13,15 @@ class TokenizedPaymentMethods implements OptionSourceInterface
     public function toOptionArray()
     {
         return [
+            /** TODO: These PMs can be enabled for recurring purposes once tested */
             /*[
                 'value' => PaymentMethods\ApplePayPaymentMethod::TX_VARIANT,
                 'label' => PaymentMethods\ApplePayPaymentMethod::NAME
-            ],*/
+            ],
             [
                 'value' => PaymentMethods\AmazonPayPaymentMethod::TX_VARIANT,
                 'label' => PaymentMethods\AmazonPayPaymentMethod::NAME
-            ],
+            ],*/
             [
                 'value' => PaymentMethods\GooglePayPaymentMethod::TX_VARIANT,
                 'label' => PaymentMethods\GooglePayPaymentMethod::NAME

diff --git a/Model/Ui/AdyenUiComponentProvider.php b/Model/Ui/AdyenUiComponentProvider.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2022 Adyen BV (https://www.adyen.com/)
+ * See LICENSE.txt for license details.
+ *
+ * Author: Adyen <magento@adyen.com>
+ */
+
+namespace Adyen\Payment\Model\Ui;
+
+use Adyen\Payment\Helper\Data;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+
+class AdyenUiComponentProvider
+{
+
+    protected $componentFactory;
+    protected $dataHelper;
+
+    /**
+     * @param TokenUiComponentInterfaceFactory $componentFactory
+     * @param Data $dataHelper
+     */
+    public function __construct(
+        TokenUiComponentInterfaceFactory $componentFactory,
+        Data $dataHelper
+    ) {
+        $this->componentFactory = $componentFactory;
+        $this->dataHelper = $dataHelper;
+    }
+
+    /**
+     * Get UI component for token
+     *
+     * @param PaymentTokenInterface $paymentToken
+     * @return TokenUiComponentInterface
+     */
+    public function getCardComponentForToken(PaymentTokenInterface $paymentToken): TokenUiComponentInterface
+    {
+        $details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
+        $details['icon'] = $this->dataHelper->getVariantIcon($details['type']);
+
+        return $this->componentFactory->create(
+            [
+                'config' => [
+                    'code' => AdyenCcConfigProvider::CC_VAULT_CODE,
+                    TokenUiComponentProviderInterface::COMPONENT_DETAILS => $details,
+                    TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash()
+                ],
+                'name' => 'Adyen_Payment/js/view/payment/method-renderer/vault'
+            ]
+        );
+    }
+}
diff --git a/Model/Ui/PaymentMethodUiComponentProvider.php b/Model/Ui/PaymentMethodUiComponentProvider.php
@@ -22,12 +22,11 @@
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
 
-class PaymentMethodUiComponentProvider implements TokenUiComponentProviderInterface
+class PaymentMethodUiComponentProvider extends AdyenUiComponentProvider implements TokenUiComponentProviderInterface
 {
 
     private $vaultHelper;
     private $paymentMethodFactory;
-    private $dataHelper;
 
     /**
      * @param TokenUiComponentInterfaceFactory $componentFactory
@@ -41,7 +40,7 @@ public function __construct(
         Vault $vaultHelper,
         PaymentMethodFactory $paymentMethodFactory
     ) {
-        $this->dataHelper = $dataHelper;
+        parent::__construct($componentFactory, $dataHelper);
         $this->vaultHelper = $vaultHelper;
         $this->paymentMethodFactory = $paymentMethodFactory;
     }

diff --git a/Model/Ui/TokenUiComponentProvider.php b/Model/Ui/TokenUiComponentProvider.php
@@ -19,22 +19,8 @@
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
 
-class TokenUiComponentProvider implements TokenUiComponentProviderInterface
+class TokenUiComponentProvider extends AdyenUiComponentProvider implements TokenUiComponentProviderInterface
 {
-    /**
-     * @param TokenUiComponentInterfaceFactory $componentFactory
-     * @param Data $dataHelper
-     */
-    public function __construct(
-        TokenUiComponentInterfaceFactory $componentFactory,
-        Data $dataHelper,
-        Vault $vaultHelper
-    ) {
-        $this->componentFactory = $componentFactory;
-        $this->dataHelper = $dataHelper;
-        $this->vaultHelper = $vaultHelper;
-    }
-
     /**
      * Get UI component for token
      *
@@ -43,22 +29,6 @@ public function __construct(
      */
     public function getComponentForToken(PaymentTokenInterface $paymentToken): TokenUiComponentInterface
     {
-        $tokenType = $this->vaultHelper->getAdyenTokenType($paymentToken);
-        $details = json_decode($paymentToken->getTokenDetails() ?: '{}', true);
-        $details['icon'] = $this->dataHelper->getVariantIcon($details['type']);
-        $createdAt = new \DateTime($paymentToken->getCreatedAt());
-        $details['created'] = $createdAt->format('Y-m-d');
-        $details['displayToken'] = $tokenType === Recurring::CARD_ON_FILE || is_null($tokenType);
-
-        return $this->componentFactory->create(
-            [
-                'config' => [
-                    'code' => AdyenCcConfigProvider::CC_VAULT_CODE,
-                    TokenUiComponentProviderInterface::COMPONENT_DETAILS => $details,
-                    TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH => $paymentToken->getPublicHash()
-                ],
-                'name' => 'Adyen_Payment/js/view/payment/method-renderer/adyen-vault-method'
-            ]
-        );
+        return $this->getCardComponentForToken($paymentToken);
     }
 }
diff --git a/Observer/InvoiceObserver.php b/Observer/InvoiceObserver.php
@@ -104,7 +104,7 @@ public function execute(Observer $observer)
 
 
         $this->logger->addAdyenDebug(
-            sprintf('Event sales_order_invoice_save_after for invoice %s will be handled', $invoice->getEntityId()),
+            'Event sales_order_invoice_save_after for invoice {invoiceId} will be handled',
             array_merge($this->logger->getInvoiceContext($invoice), $this->logger->getOrderContext($order))
         );
 
@@ -134,7 +134,7 @@ public function execute(Observer $observer)
         $order->setStatus($status);
 
         $this->logger->addAdyenDebug(
-            sprintf('Event sales_order_invoice_save_after for invoice %s was handled', $invoice->getEntityId()),
+            'Event sales_order_invoice_save_after for invoice {invoiceId} was handled',
             array_merge($this->logger->getInvoiceContext($invoice), $this->logger->getOrderContext($order))
         );
     }

diff --git a/Plugin/CustomerFilterVaultTokens.php b/Plugin/CustomerFilterVaultTokens.php
@@ -11,13 +11,16 @@
 
 namespace Adyen\Payment\Plugin;
 
+use Adyen\Payment\Helper\Vault;
 use Magento\Vault\Model\CustomerTokenManagement;
 use Adyen\Payment\Helper\Recurring;
 
 class CustomerFilterVaultTokens
 {
     /**
      * Returns filtered list of payment tokens for current customer session
+     * Hide token if it is specifically set to SUBSCRIPTION or UNSCHEDULED_CARD_ON_FILE
+     *
      * @param CustomerTokenManagement $customerTokenManagement
      * @param array $customerSessionTokens
      * @return array
@@ -27,7 +30,7 @@ public function afterGetCustomerSessionTokens(CustomerTokenManagement $customerT
         foreach($customerSessionTokens as $key => $token) {
             if (strpos($token->getPaymentMethodCode(), 'adyen_') === 0) {
                 $tokenDetails = json_decode($token->getTokenDetails());
-                if ($tokenDetails->tokenType === Recurring::UNSCHEDULED_CARD_ON_FILE || $tokenDetails->tokenType === Recurring::SUBSCRIPTION) {
+                if (property_exists($tokenDetails, Vault::TOKEN_TYPE) && in_array($tokenDetails->tokenType, [Recurring::SUBSCRIPTION, Recurring::UNSCHEDULED_CARD_ON_FILE])) {
                     unset($customerSessionTokens[$key]);
                 }
             }

diff --git a/Plugin/PaymentVaultDeleteToken.php b/Plugin/PaymentVaultDeleteToken.php
@@ -3,58 +3,70 @@
  *
  * Adyen Payment module (https://www.adyen.com/)
  *
- * Copyright (c) 2019 Adyen BV (https://www.adyen.com/)
+ * Copyright (c) 2022 Adyen BV (https://www.adyen.com/)
  * See LICENSE.txt for license details.
  *
  * Author: Adyen <magento@adyen.com>
  */
 
 namespace Adyen\Payment\Plugin;
 
+use Adyen\Payment\Model\Api\PaymentRequest;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentTokenRepositoryInterface;
 
 class PaymentVaultDeleteToken
 {
     /**
-     * @var \Adyen\Payment\Model\Api\PaymentRequest
+     * @var PaymentRequest
      */
     protected $paymentRequest;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
      * PaymentVaultDeleteToken constructor.
      *
-     * @param \Adyen\Payment\Model\Api\PaymentRequest $paymentRequest
+     * @param PaymentRequest $paymentRequest
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Adyen\Payment\Model\Api\PaymentRequest $paymentRequest,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        PaymentRequest $paymentRequest,
+        StoreManagerInterface $storeManager
     ) {
         $this->paymentRequest = $paymentRequest;
         $this->storeManager = $storeManager;
     }
 
+    /**
+     * @throws NoSuchEntityException
+     * @throws LocalizedException
+     */
     public function beforeDelete(
-        \Magento\Vault\Api\PaymentTokenRepositoryInterface $subject,
+        PaymentTokenRepositoryInterface $subject,
         PaymentTokenInterface $paymentToken
     ) {
         $paymentMethodCode = $paymentToken->getPaymentMethodCode();
+        $storeId = $this->storeManager->getStore()->getStoreId();
 
         if (is_null($paymentMethodCode) || strpos($paymentMethodCode, 'adyen_') !== 0) {
             return [$paymentToken];
         }
+
         try {
             $this->paymentRequest->disableRecurringContract(
                 $paymentToken->getGatewayToken(),
                 $paymentToken->getCustomerId(),
-                $this->storeManager->getStore()->getStoreId()
+                $storeId
             );
         } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('Failed to disable this contract'));
+            throw new LocalizedException(__('Failed to disable this contract'));
         }
     }
 }