Vipps 434: Prepare for MobilePay.

Api/Fallback/AuthoriseInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vipps\Payment\Api\Fallback;
+
+use Magento\Framework\App\RequestInterface;
+use Vipps\Payment\Api\Data\QuoteInterface;
+
+interface AuthoriseInterface
+{
+    public function do(RequestInterface $request, QuoteInterface $vippsQuote): void;
+
+    public function getOrderId(RequestInterface $request): string;
+}

Api/Payment/CommandManagerInterface.php

@@ -0,0 +1,77 @@
+<?php declare(strict_types=1);
+
+/**
+ * Copyright 2023 Vipps
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+ * TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+namespace Vipps\Payment\Api\Payment;
+
+use Magento\Payment\Gateway\Command\ResultInterface;
+use Magento\Payment\Model\InfoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Vipps\Payment\Gateway\Exception\VippsException;
+
+/**
+ * Interface PaymentCommandManagerInterface
+ * @package Vipps\Payment\Api
+ * @api
+ */
+interface CommandManagerInterface
+{
+    /**
+     * @param string $reference
+     * @param array $arguments
+     *
+     * @return mixed
+     */
+    public function getPayment($reference, $arguments = []);
+
+    /**
+     * @param string $orderId
+     * @param array $arguments
+     *
+     * @return mixed
+     */
+    public function getPaymentEventLog($orderId, $arguments = []);
+
+    /**
+     * Send Receipt.
+     *
+     * @param array $arguments
+     *
+     * @return mixed
+     * @throws VippsException
+     */
+    public function sendReceipt(OrderInterface $order, $arguments = []);
+
+    /**
+     * Method to execute cancel Command.
+     *
+     * @param InfoInterface $payment
+     * @param array $arguments
+     *
+     * @return mixed
+     */
+    public function cancel(InfoInterface $payment, $arguments = []);
+
+    /**
+     * Initiate payment action.
+     *
+     * @param InfoInterface $payment
+     * @param array $arguments
+     *
+     * @return ResultInterface|null
+     */
+    public function initiatePayment(InfoInterface $payment, $arguments);
+}

Api/Transaction/PaymentDetailsInterface.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vipps\Payment\Api\Transaction;
+
+interface PaymentDetailsInterface
+{
+    public function get(string $orderId);
+}

Block/Express/Button.php

@@ -13,6 +13,7 @@
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
+
 namespace Vipps\Payment\Block\Express;
 
 use Magento\Framework\View\Element\Template;
@@ -21,6 +22,7 @@
 use Magento\Framework\Math\Random;
 use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Catalog\Block\ShortcutInterface;
+use Vipps\Payment\Model\Config\Source\Version;
 
 /**
  * Class Button
@@ -67,9 +69,9 @@ class Button extends Template implements ShortcutInterface
      */
     public function __construct(
         Template\Context $context,
-        Random $mathRandom,
-        ConfigInterface $config,
-        array $data = []
+        Random           $mathRandom,
+        ConfigInterface  $config,
+        array            $data = []
     ) {
         $this->config = $config;
         $this->assetRepo = $context->getAssetRepository();
@@ -87,7 +89,9 @@ public function __construct(
     protected function _toHtml() //@codingStandardsIgnoreLine
     {
         if (!$this->config->getValue('active')
-            || !$this->config->getValue('express_checkout')) {
+            || !$this->config->getValue('express_checkout')
+            || $this->config->getValue('version') !== Version::CONFIG_VIPPS
+        ) {
             return '';
         }
         if (!$this->getIsInCatalogProduct() &&

Controller/Payment/Fallback.php

@@ -39,8 +39,11 @@
 use Vipps\Payment\Api\Data\QuoteInterface;
 use Vipps\Payment\Api\QuoteRepositoryInterface;
 use Vipps\Payment\Gateway\Transaction\Transaction;
+use Vipps\Payment\GatewayEpayment\Data\Payment;
+use Vipps\Payment\Model\Fallback\AuthoriseProxy;
 use Vipps\Payment\Model\Gdpr\Compliance;
 use Vipps\Payment\Model\OrderLocator;
+use Vipps\Payment\Model\Transaction\StatusVisitor;
 use Vipps\Payment\Model\TransactionProcessor;
 
 /**
@@ -119,6 +122,8 @@ class Fallback implements ActionInterface, CsrfAwareActionInterface
      * @var OrderInterface|null
      */
     private $order;
+    private StatusVisitor $statusVisitor;
+    private AuthoriseProxy $authoriseProxy;
 
     /**
      * Fallback constructor.
@@ -139,18 +144,20 @@ class Fallback implements ActionInterface, CsrfAwareActionInterface
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        ResultFactory $resultFactory,
-        RequestInterface $request,
-        SessionManagerInterface $checkoutSession,
-        TransactionProcessor $transactionProcessor,
-        CartRepositoryInterface $cartRepository,
-        ManagerInterface $messageManager,
+        ResultFactory            $resultFactory,
+        RequestInterface         $request,
+        SessionManagerInterface  $checkoutSession,
+        TransactionProcessor     $transactionProcessor,
+        CartRepositoryInterface  $cartRepository,
+        ManagerInterface         $messageManager,
         QuoteRepositoryInterface $vippsQuoteRepository,
         OrderManagementInterface $orderManagement,
-        OrderLocator $orderLocator,
-        Compliance $compliance,
-        LoggerInterface $logger,
-        ConfigInterface $config
+        OrderLocator             $orderLocator,
+        Compliance               $compliance,
+        LoggerInterface          $logger,
+        ConfigInterface          $config,
+        StatusVisitor            $statusVisitor,
+        AuthoriseProxy           $authoriseProxy
     ) {
         $this->resultFactory = $resultFactory;
         $this->request = $request;
@@ -164,6 +171,8 @@ public function __construct(
         $this->orderManagement = $orderManagement;
         $this->logger = $logger;
         $this->config = $config;
+        $this->statusVisitor = $statusVisitor;
+        $this->authoriseProxy = $authoriseProxy;
     }
 
     /**
@@ -176,9 +185,10 @@ public function execute()
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         try {
-            $this->authorize();
-
             $vippsQuote = $this->getVippsQuote();
+
+            $this->authoriseProxy->do($this->request, $vippsQuote);
+
             $transaction = $this->transactionProcessor->process($vippsQuote);
 
             $resultRedirect = $this->prepareResponse($resultRedirect, $transaction);
@@ -196,7 +206,7 @@ public function execute()
             $cartPersistence = $this->config->getValue('cancellation_cart_persistence');
 
             $quoteCouldBeRestored = $transaction
-                && ($transaction->transactionWasCancelled() || $transaction->isTransactionExpired());
+                && ($this->statusVisitor->isCanceled($transaction) || $this->statusVisitor->isExpired($transaction));
             $order = $this->getOrder();
 
             if ($quoteCouldBeRestored && $cartPersistence) {
@@ -285,20 +295,20 @@ private function getVippsQuote($forceReload = false): QuoteInterface
     {
         if (null === $this->vippsQuote || $forceReload) {
             $this->vippsQuote = $this->vippsQuoteRepository
-                ->loadByOrderId($this->request->getParam('order_id'));
+                ->loadByOrderId($this->authoriseProxy->getOrderId($this->request));
         }
 
         return $this->vippsQuote;
     }
 
     /**
      * @param Redirect $resultRedirect
-     * @param Transaction $transaction
+     * @param Transaction|Payment $transaction
      *
      * @return Redirect
      * @throws \Exception
      */
-    private function prepareResponse(Redirect $resultRedirect, Transaction $transaction)
+    private function prepareResponse(Redirect $resultRedirect, $transaction)
     {
         $this->defineMessage($transaction);
         $this->defineRedirectPath($resultRedirect, $transaction);
@@ -344,13 +354,19 @@ private function isCartPersistent()
         return $this->config->getValue('cancellation_cart_persistence');
     }
 
-    private function defineMessage(Transaction $transaction): void
+    /**
+     * @param Transaction|Payment $transaction
+     * @return void
+     */
+    private function defineMessage($transaction): void
     {
-        if ($transaction->transactionWasCancelled()) {
+        if ($this->statusVisitor->isCanceled($transaction)) {
             $this->messageManager->addWarningMessage(__('Your order was cancelled in Vipps.'));
-        } elseif ($transaction->isTransactionReserved() || $transaction->isTransactionCaptured()) {
-            //$this->messageManager->addWarningMessage(__('Your order was successfully placed.'));
-        } elseif ($transaction->isTransactionExpired()) {
+        } elseif (
+            $this->statusVisitor->isReserved($transaction)
+            || $this->statusVisitor->isCaptured($transaction)) {
+            $this->messageManager->addWarningMessage(__('Your order was successfully placed.'));
+        } elseif ($this->statusVisitor->isExpired($transaction)) {
             $this->messageManager->addErrorMessage(
                 __('Transaction was expired. Please, place your order again')
             );
@@ -363,13 +379,15 @@ private function defineMessage(Transaction $transaction): void
 
     /**
      * @param Redirect $resultRedirect
-     * @param Transaction $transaction
+     * @param Transaction|Payment $transaction
      *
      * @throws NoSuchEntityException
      */
-    private function defineRedirectPath(Redirect $resultRedirect, Transaction $transaction): void
+    private function defineRedirectPath(Redirect $resultRedirect, $transaction): void
     {
-        if ($transaction->isTransactionReserved() || $transaction->isTransactionCaptured()) {
+        if ($this->statusVisitor->isReserved($transaction)
+            || $this->statusVisitor->isCaptured($transaction)
+        ) {
             $resultRedirect->setPath('checkout/onepage/success', ['_secure' => true]);
         } else {
             $orderId = $this->getOrder() ? $this->getOrder()->getEntityId() : null;

Controller/Payment/InitRegular.php

@@ -135,7 +135,8 @@ public function execute()
      */
     private function initiatePayment(CartInterface $quote)
     {
-        return $this->commandManager->initiatePayment(
+        return $this->commandManager
+            ->initiatePayment(
             $quote->getPayment(),
             [
                 'amount' => $quote->getGrandTotal(),

Controller/Payment/Klarna/InitRegular.php

@@ -39,7 +39,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Psr\Log\LoggerInterface;
-use Vipps\Payment\Api\CommandManagerInterface;
+use Vipps\Payment\Api\Payment\CommandManagerInterface;
 use Vipps\Payment\Gateway\Request\Initiate\InitiateBuilderInterface;
 use Vipps\Payment\Model\Method\Vipps;
 use function __;

Cron/CancelQuoteByAttempts.php

@@ -29,62 +29,20 @@
 use Vipps\Payment\Model\ResourceModel\Quote\CollectionFactory as VippsQuoteCollectionFactory;
 
 /**
- * Class FetchOrderStatus
- * @package Vipps\Payment\Cron
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CancelQuoteByAttempts
 {
-    /**
-     * Order collection page size
-     */
-    const COLLECTION_PAGE_SIZE = 250;
-
-    /**
-     * @var string
-     */
-    const DEFAULT_ATTEMPTS_MAX_COUNT = 3;
+    private const COLLECTION_PAGE_SIZE = 250;
+    private const DEFAULT_ATTEMPTS_MAX_COUNT = 3;
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
+    private StoreManagerInterface $storeManager;
+    private ScopeCodeResolver $scopeCodeResolver;
+    private Config $cancellationConfig;
+    private VippsQuoteCollectionFactory $vippsQuoteCollectionFactory;
+    private CancelFacade $cancelFacade;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var ScopeCodeResolver
-     */
-    private $scopeCodeResolver;
-
-    /**
-     * @var Config
-     */
-    private $cancellationConfig;
-
-    /**
-     * @var VippsQuoteCollectionFactory
-     */
-    private $vippsQuoteCollectionFactory;
-
-    /**
-     * @var CancelFacade
-     */
-    private $cancelFacade;
-
-    /**
-     * CancelQuoteByAttempts constructor.
-     *
-     * @param LoggerInterface $logger
-     * @param StoreManagerInterface $storeManager
-     * @param ScopeCodeResolver $scopeCodeResolver
-     * @param Config $cancellationConfig
-     * @param VippsQuoteCollectionFactory $vippsQuoteCollectionFactory
-     * @param CancelFacade $cancelFacade
-     */
     public function __construct(
         LoggerInterface $logger,
         StoreManagerInterface $storeManager,
@@ -102,11 +60,9 @@ public function __construct(
     }
 
     /**
-     * Create orders from Vipps that are not created in Magento yet
-     *
      * @throws NoSuchEntityException
      */
-    public function execute()
+    public function execute(): void
     {
         try {
             $currentStore = $this->storeManager->getStore()->getId();