MAGETWO-59197: Create UI component and server structure for Vault

 - Added more flexible configuration for Vault internal usage

Author: YevSent

app/code/Magento/Vault/Model/Method/Vault.php

@@ -5,17 +5,16 @@
  */
 namespace Magento\Vault\Model\Method;
 
-use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Payment\Gateway\Command;
-use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
 use Magento\Payment\Gateway\ConfigFactoryInterface;
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
@@ -275,8 +274,12 @@ public function canVoid()
      */
     public function canUseInternal()
     {
-        return $this->config->getValue('can_use_internal', $this->getStore())
-            || $this->getVaultProvider()->canUseInternal();
+        $isInternalAllowed = $this->getConfiguredValue('can_use_internal');
+        // if config has't been specified for Vault, need to check payment provider option
+        if ($isInternalAllowed === null) {
+            return $this->getVaultProvider()->canUseInternal();
+        }
+        return (bool) $isInternalAllowed;
     }
 
     /**

app/code/Magento/Vault/Test/Unit/Model/Method/VaultTest.php

@@ -8,6 +8,8 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Gateway\Command\CommandManagerInterface;
 use Magento\Payment\Gateway\Command\CommandManagerPoolInterface;
+use Magento\Payment\Gateway\Config\ValueHandlerInterface;
+use Magento\Payment\Gateway\Config\ValueHandlerPoolInterface;
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\MethodInterface;
@@ -314,11 +316,17 @@ public function testIsAvailableWithoutQuote()
      */
     public function testCanUseInternal($configValue, $paymentValue, $expected)
     {
-        $config = $this->getMock(ConfigInterface::class);
+        $handlerPool = $this->getMock(ValueHandlerPoolInterface::class);
+        $handler = $this->getMock(ValueHandlerInterface::class);
 
-        $config->expects(static::once())
-            ->method('getValue')
-            ->with('can_use_internal', null)
+        $handlerPool->expects(static::once())
+            ->method('get')
+            ->with('can_use_internal')
+            ->willReturn($handler);
+
+        $handler->expects(static::once())
+            ->method('handle')
+            ->with(['field' => 'can_use_internal'], null)
             ->willReturn($configValue);
 
         $this->vaultProvider->expects(static::any())
@@ -327,8 +335,8 @@ public function testCanUseInternal($configValue, $paymentValue, $expected)
 
         /** @var Vault $model */
         $model = $this->objectManager->getObject(Vault::class, [
-            'config' => $config,
-            'vaultProvider' => $this->vaultProvider
+            'vaultProvider' => $this->vaultProvider,
+            'valueHandlerPool' => $handlerPool,
         ]);
         static::assertEquals($expected, $model->canUseInternal());
     }
@@ -343,7 +351,7 @@ public function internalUsageDataProvider()
             ['configValue' => true, 'paymentValue' => true, 'expected' => true],
             ['configValue' => true, 'paymentValue' => null, 'expected' => true],
             ['configValue' => true, 'paymentValue' => false, 'expected' => true],
-            ['configValue' => false, 'paymentValue' => true, 'expected' => true],
+            ['configValue' => false, 'paymentValue' => true, 'expected' => false],
             ['configValue' => false, 'paymentValue' => false, 'expected' => false],
             ['configValue' => null, 'paymentValue' => true, 'expected' => true],
             ['configValue' => null, 'paymentValue' => false, 'expected' => false],