ENGCOM-4839: Prevent display of token when save for later is not selected #19767

Author: sivaschenko

app/code/Magento/Vault/Observer/AfterPaymentSaveObserver.php

@@ -77,11 +77,9 @@ public function execute(Observer $observer)
         $paymentToken->setPaymentMethodCode($payment->getMethod());
 
         $additionalInformation = $payment->getAdditionalInformation();
-        if (isset($additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE])) {
-            $paymentToken->setIsVisible(
-                (bool) (int) $additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE]
-            );
-        }
+        $paymentToken->setIsVisible(
+            (bool) (int) ($additionalInformation[VaultConfigProvider::IS_ACTIVE_CODE] ?? 0)
+        );
 
         $paymentToken->setPublicHash($this->generatePublicHash($paymentToken));
 
@@ -115,7 +113,7 @@ protected function generatePublicHash(PaymentTokenInterface $paymentToken)
     /**
      * Reads Payment token from Order Payment
      *
-     * @param OrderPaymentExtensionInterface | null $extensionAttributes
+     * @param OrderPaymentExtensionInterface|null $extensionAttributes
      * @return PaymentTokenInterface | null
      */
     protected function getPaymentToken(OrderPaymentExtensionInterface $extensionAttributes = null)

app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Vault\Test\Unit\Observer;
 
 use Magento\Framework\App\DeploymentConfig;
@@ -15,9 +16,13 @@
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Model\PaymentToken;
 use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Model\Ui\VaultConfigProvider;
 use Magento\Vault\Observer\AfterPaymentSaveObserver;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Tests for AfterPaymentSaveObserver.
+ */
 class AfterPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -93,7 +98,7 @@ protected function setUp()
 
         // Sales Order Payment Model
         $this->salesOrderPaymentMock = $this->getMockBuilder(Payment::class)
-            ->setMethods(null)
+            ->setMethods(['getAdditionalInformation'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->salesOrderPaymentMock->setOrder($this->salesOrderMock);
@@ -122,9 +127,10 @@ protected function setUp()
      * @param string $token
      * @param bool $isActive
      * @param string $method
+     * @param array $additionalInfo
      * @dataProvider positiveCaseDataProvider
      */
-    public function testPositiveCase($customerId, $createdAt, $token, $isActive, $method)
+    public function testPositiveCase($customerId, $createdAt, $token, $isActive, $method, $additionalInfo)
     {
         $this->paymentTokenMock->setGatewayToken($token);
         $this->paymentTokenMock->setCustomerId($customerId);
@@ -136,6 +142,8 @@ public function testPositiveCase($customerId, $createdAt, $token, $isActive, $me
             ->method('getVaultPaymentToken')
             ->willReturn($this->paymentTokenMock);
 
+        $this->salesOrderPaymentMock->method('getAdditionalInformation')->willReturn($additionalInfo);
+
         if (!empty($token)) {
             $this->paymentTokenManagementMock->expects($this->once())
                 ->method('saveTokenWithPaymentLink')
@@ -158,6 +166,10 @@ public function testPositiveCase($customerId, $createdAt, $token, $isActive, $me
         static::assertEquals($token, $paymentToken->getGatewayToken());
         static::assertEquals($isActive, $paymentToken->getIsActive());
         static::assertEquals($createdAt, $paymentToken->getCreatedAt());
+        static::assertEquals(
+            $additionalInfo[VaultConfigProvider::IS_ACTIVE_CODE] ?? false,
+            $paymentToken->getIsVisible()
+        );
     }
 
     /**
@@ -171,14 +183,32 @@ public function positiveCaseDataProvider()
                 '10\20\2015',
                 'asdfg',
                 true,
-                'paypal'
+                'paypal',
+                [],
+            ],
+            [
+                1,
+                '10\20\2015',
+                'asdfg',
+                true,
+                'paypal',
+                [VaultConfigProvider::IS_ACTIVE_CODE => true],
+            ],
+            [
+                1,
+                '10\20\2015',
+                'asdfg',
+                true,
+                'paypal',
+                [VaultConfigProvider::IS_ACTIVE_CODE => false],
             ],
             [
                 null,
                 null,
                 null,
                 false,
-                null
+                null,
+                [],
             ],
         ];
     }