Merge pull request #585 from Adyen/develop

Release 5.0.2

Plugin/GuestPaymentInformationManagement.php

+<?php
+/**
+ *                       ######
+ *                       ######
+ * ############    ####( ######  #####. ######  ############   ############
+ * #############  #####( ######  #####. ######  #############  #############
+ *        ######  #####( ######  #####. ######  #####  ######  #####  ######
+ * ###### ######  #####( ######  #####. ######  #####  #####   #####  ######
+ * ###### ######  #####( ######  #####. ######  #####          #####  ######
+ * #############  #############  #############  #############  #####  ######
+ *  ############   ############  #############   ############  #####  ######
+ *                                      ######
+ *                               #############
+ *                               ############
+ *
+ * Adyen Payment module (https://www.adyen.com/)
+ *
+ * Copyright (c) 2019 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\Ui\AdyenCcConfigProvider;
+
+class GuestPaymentInformationManagement
+{
+    /**
+     * @var \Magento\Sales\Api\OrderRepositoryInterface
+     */
+    protected $orderRepository;
+
+    /**
+     * @var \Adyen\Payment\Logger\AdyenLogger
+     */
+    protected $adyenLogger;
+
+    /**
+     * @var \Adyen\Payment\Helper\Data
+     */
+    protected $adyenHelper;
+
+    /**
+     * GuestPaymentInformationManagement constructor.
+     *
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
+     * @param \Adyen\Payment\Helper\Data $adyenHelper
+     */
+    public function __construct(
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
+        \Adyen\Payment\Helper\Data $adyenHelper
+    ) {
+        $this->orderRepository = $orderRepository;
+        $this->adyenLogger = $adyenLogger;
+        $this->adyenHelper = $adyenHelper;
+    }
+
+    /**
+     * @param \Magento\Checkout\Api\GuestPaymentInformationManagementInterface $subject
+     * @param $result
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function afterSavePaymentInformationAndPlaceOrder(
+        \Magento\Checkout\Api\GuestPaymentInformationManagementInterface $subject,
+        $result
+    ) {
+        try {
+            $order = $this->orderRepository->get($result);
+            $payment = $order->getPayment();
+
+            if ($payment->getMethod() === AdyenCcConfigProvider::CODE) {
+                return $this->adyenHelper->buildThreeDS2ProcessResponseJson(
+                    $payment->getAdditionalInformation('threeDSType'),
+                    $payment->getAdditionalInformation('threeDS2Token')
+                );
+            } else {
+                return $result;
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->adyenLogger->error("Exception: " . $e->getMessage());
+            throw new \Magento\Framework\Exception\LocalizedException(__('This order no longer exists.'));
+        }
+
+        return $result;
+    }
+}

composer.json

@@ -2,7 +2,7 @@
   "name": "adyen/module-payment",
   "description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
   "type": "magento2-module",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

etc/di.xml

@@ -1030,6 +1030,9 @@
         <plugin name="AdyenPaymentVaultDeleteToken" type="Adyen\Payment\Plugin\PaymentVaultDeleteToken" sortOrder="10"/>
     </type>
     <type name="Magento\Checkout\Api\PaymentInformationManagementInterface">
-        <plugin name="AdyenPaymentInformationManagementAddPaymentInfo" type="Adyen\Payment\Plugin\PaymentInformationManagement"/>
+        <plugin name="AdyenPaymentInformationManagementAddPaymentInfo" type="Adyen\Payment\Plugin\PaymentInformationManagement" sortOrder="10"/>
+    </type>
+    <type name="Magento\Checkout\Api\GuestPaymentInformationManagementInterface">
+        <plugin name="AdyenGuestPaymentInformationManagementAddPaymentInfo" type="Adyen\Payment\Plugin\GuestPaymentInformationManagement" sortOrder="10"/>
     </type>
 </config>