Asd 687

Api/CheckoutSessionManagementInterface.php

@@ -21,57 +21,37 @@
 interface CheckoutSessionManagementInterface
 {
     /**
-     * @param mixed $cartId
      * @return mixed
      */
-    public function getConfig($cartId);
+    public function getConfig();
 
     /**
-     * @param mixed $cartId
-     * @param mixed $checkoutSessionId
+     * @param mixed $amazonSessionId
      * @return mixed
      */
-    public function storeCheckoutSession($cartId, $checkoutSessionId);
+    public function getShippingAddress($amazonSessionId);
 
     /**
-     * @param mixed $cartId
+     * @param mixed $amazonSessionId
      * @return mixed
      */
-    public function getShippingAddress($cartId);
+    public function getBillingAddress($amazonSessionId);
 
     /**
-     * @param mixed $cartId
-     * @return mixed
-     */
-    public function getBillingAddress($cartId);
-
-    /**
-     * @param mixed $cartId
-     * @return string
-     */
-    public function getPaymentDescriptor($cartId);
-
-    /**
-     * @param mixed $cartId
-     * @return void
-     */
-    public function cancelCheckoutSession($cartId);
-
-    /**
-     * @param mixed $cartId
+     * @param mixed $amazonSessionId
      * @return string
      */
-    public function getCheckoutSession($cartId);
+    public function getPaymentDescriptor($amazonSessionId);
 
     /**
-     * @param mixed $cartId
+     * @param mixed $amazonSessionId
      * @return string
      */
-    public function updateCheckoutSession($cartId);
+    public function updateCheckoutSession($amazonSessionId);
 
     /**
-     * @param mixed $cartId
+     * @param mixed $amazonSessionId
      * @return int
      */
-    public function completeCheckoutSession($cartId);
+    public function completeCheckoutSession($amazonSessionId);
 }

Controller/Checkout/CompleteSession.php

@@ -27,6 +27,11 @@ class CompleteSession extends \Magento\Framework\App\Action\Action
      */
     private $amazonCheckoutSession;
 
+    /**
+     * @var \Amazon\Pay\Model\CheckoutSessionManagement
+     */
+    private $amazonCheckoutSessionManagement;
+
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
@@ -59,13 +64,15 @@ class CompleteSession extends \Magento\Framework\App\Action\Action
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Amazon\Pay\CustomerData\CheckoutSession $amazonCheckoutSession,
+        \Amazon\Pay\Model\CheckoutSessionManagement $checkoutSessionManagement,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         ExceptionLogger $exceptionLogger = null
     ) {
         parent::__construct($context);
         $this->amazonCheckoutSession = $amazonCheckoutSession;
+        $this->amazonCheckoutSessionManagement = $checkoutSessionManagement;
         $this->exceptionLogger = $exceptionLogger ?: ObjectManager::getInstance()->get(ExceptionLogger::class);
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
@@ -81,9 +88,9 @@ public function execute()
         try {
             // Bypass cache check in \Magento\PageCache\Model\DepersonalizeChecker
             $this->getRequest()->setParams(['ajax' => 1]);
-            $result = $this->amazonCheckoutSession->completeCheckoutSession();
+            $amazonCheckoutSessionId = $this->getRequest()->getParam('amazonCheckoutSessionId');
+            $result = $this->amazonCheckoutSessionManagement->completeCheckoutSession($amazonCheckoutSessionId);
             if (!$result['success']) {
-                $this->amazonCheckoutSession->clearCheckoutSessionId();
                 $this->messageManager->addErrorMessage($result['message']);
 
                 return $this->_redirect('checkout/cart', ['_scope' => $scope]);
@@ -96,7 +103,6 @@ public function execute()
             ]);
         } catch (\Exception $e) {
             $this->exceptionLogger->logException($e);
-            $this->amazonCheckoutSession->clearCheckoutSessionId();
             $this->messageManager->addErrorMessage($e->getMessage());
         }
 

Controller/Login/Checkout.php

@@ -38,11 +38,6 @@ public function execute()
                 $checkoutSessionId
             );
 
-            $this->checkoutSessionManagement->storeCheckoutSession(
-                $this->session->getQuote()->getId(),
-                $checkoutSessionId
-            );
-
             if (!$this->amazonConfig->isLwaEnabled()) {
                 $userInfo = $checkoutSession['buyer'];
                 if ($userInfo && isset($userInfo['email'])) {

CustomerData/CheckoutSession.php

@@ -50,28 +50,4 @@ public function getConfig()
     {
         return $this->checkoutSessionManagement->getConfig($this->session->getQuote());
     }
-
-    /**
-     * Clear Amazon Checkout Session Id
-     */
-    public function clearCheckoutSessionId()
-    {
-        $this->checkoutSessionManagement->cancelCheckoutSession($this->session->getQuote());
-    }
-
-    /**
-     * Get Amazon Checkout Session Id
-     */
-    public function getCheckoutSessionId()
-    {
-        return $this->checkoutSessionManagement->getCheckoutSession($this->session->getQuote());
-    }
-
-    /**
-     * Complete Amazon Checkout Session
-     */
-    public function completeCheckoutSession()
-    {
-        return $this->checkoutSessionManagement->completeCheckoutSession($this->session->getQuote());
-    }
 }

Gateway/Request/AuthorizationSaleRequestBuilder.php

@@ -51,11 +51,8 @@ public function __construct(
     public function build(array $buildSubject)
     {
         $payment = $this->subjectReader->readPayment($buildSubject)->getPayment();
-        try {
-            $amazonCheckoutSessionId = $this->sessionManagement->getCheckoutSession($payment->getOrder()->getQuoteId());
-        } catch (NoSuchEntityException $e) {
-            $amazonCheckoutSessionId = null;
-        }
+
+        $amazonCheckoutSessionId = $payment->getAdditionalInformation('amazon_session_id');
 
         if ($payment->getAmazonDisplayInvoiceAmount()) {
             $total = $payment->getAmazonDisplayInvoiceAmount();