Merge pull request #18 from mercadopago/release/1.8.3

v.1.8.3
mercadopago · Sep 5, 2024 · e456d2d · e456d2d
2 parents 2da109a + cf447d2
commit e456d2d
Show file tree

Hide file tree

Showing 37 changed files with 721 additions and 253 deletions.
diff --git a/Block/MpDeviceSessionId.php b/Block/MpDeviceSessionId.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace MercadoPago\AdbPayment\Block;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Math\Random;
+use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Policy\FetchPolicy;
+
+class MpDeviceSessionId extends Template
+{
+    private const NONCE_LENGTH = 32;
+
+    private DynamicCollector $dynamicCollector;
+    private Random $random;
+
+    /**
+     * @param Context $context
+     * @param DynamicCollector $dynamicCollector
+     * @param Random $random
+     * @param array $data
+     */
+    public function __construct(Context $context, DynamicCollector $dynamicCollector,  Random $random, array $data = [])
+    {
+        parent::__construct($context, $data);
+
+        $this->dynamicCollector = $dynamicCollector;
+        $this->random = $random;
+    }
+
+    public function getNonce(): string
+    {
+        $nonce = $this->random->getRandomString(
+            self::NONCE_LENGTH,
+            Random::CHARS_DIGITS . Random::CHARS_LOWERS
+        );
+
+        $policy = new FetchPolicy(
+            'script-src',
+            false,
+            [],
+            [],
+            false,
+            false,
+            false,
+            [$nonce],
+            []
+        );
+
+        $this->dynamicCollector->add($policy);
+
+        return base64_encode($nonce);
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.3] - 2024-09-05
+### Changed
+- Adjusting the rule used to obtain expired orders and cancel them via Cron
+- Separate device fingerprint from SDK + add nonce to load script
+
+### Added
+- Added logs to errors with MPClient or SDK requests
+
 ## [1.8.2] - 2024-05-27
 ### Fixed
 - Fixed intermittent error when saving payment details

diff --git a/Cron/CancelCheckoutCredits.php b/Cron/CancelCheckoutCredits.php
@@ -9,6 +9,7 @@
 
 namespace MercadoPago\AdbPayment\Cron;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
@@ -41,24 +42,32 @@ class CancelCheckoutCredits extends CancelCheckoutPro
      */
     protected $collectionFactory;
 
+    /**
+     * @var ResourceConnection
+     */
+    protected $resource;
+
     /**
      * Constructor.
      *
      * @param Logger            $logger
      * @param FetchStatus       $fetchStatus
      * @param ConfigCheckoutPro $configCheckoutPro
      * @param CollectionFactory $collectionFactory
+     * @param ResourceConnection $resource;
      */
     public function __construct(
         Logger $logger,
         FetchStatus $fetchStatus,
         ConfigCheckoutCredits $configCheckoutCredits,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        ResourceConnection $resource
     ) {
         $this->logger = $logger;
         $this->fetchStatus = $fetchStatus;
         $this->configCheckoutCredits = $configCheckoutCredits;
         $this->collectionFactory = $collectionFactory;
+        $this->resource = $resource;
     }
 
     /**
@@ -68,21 +77,21 @@ public function __construct(
      */
     public function execute()
     {
-        $expiration = $this->configCheckoutCredits->getExpiredPaymentDate();
-
         $orders = $this->collectionFactory->create()
-            ->addFieldToFilter('state', Order::STATE_NEW)
-            ->addAttributeToFilter('created_at', [
-                'lteq' => $expiration,
-            ]);
+            ->addFieldToFilter('state', Order::STATE_NEW);
 
         $orders->getSelect()
             ->join(
-                ['sop' => 'sales_order_payment'],
+                ['sop' => $this->getSalesOrderPaymentTableName()],
                 'main_table.entity_id = sop.parent_id',
                 ['method']
             )
-            ->where('sop.method = ?', ConfigCheckoutCredits::METHOD);
+            ->where(
+                new \Zend_Db_Expr(
+                    "sop.method = ? AND TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, CAST(JSON_EXTRACT(sop.additional_information, '$.date_of_expiration') AS DATETIME))) >= 0 "
+                ),
+                ConfigCheckoutCredits::METHOD
+            );
 
         foreach ($orders as $order) {
             $orderId = $order->getEntityId();

diff --git a/Cron/CancelCheckoutPro.php b/Cron/CancelCheckoutPro.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © MercadoPago. All rights reserved.
  *
@@ -8,6 +9,7 @@
 
 namespace MercadoPago\AdbPayment\Cron;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
@@ -39,24 +41,42 @@ class CancelCheckoutPro
      */
     protected $collectionFactory;
 
+    /**
+     * @var ResourceConnection
+     */
+    protected $resource;
+
     /**
      * Constructor.
      *
      * @param Logger            $logger
      * @param FetchStatus       $fetchStatus
      * @param ConfigCheckoutPro $configCheckoutPro
      * @param CollectionFactory $collectionFactory
+     * @param ResourceConnection $resource;
      */
     public function __construct(
         Logger $logger,
         FetchStatus $fetchStatus,
         ConfigCheckoutPro $configCheckoutPro,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        ResourceConnection $resource
     ) {
         $this->logger = $logger;
         $this->fetchStatus = $fetchStatus;
         $this->configCheckoutPro = $configCheckoutPro;
         $this->collectionFactory = $collectionFactory;
+        $this->resource = $resource;
+    }
+
+    /**
+     * Get sales_order_payment table name.
+     *
+     * @return string
+     */
+    public function getSalesOrderPaymentTableName()
+    {
+        return $this->resource->getTableName('sales_order_payment');
     }
 
     /**
@@ -66,21 +86,18 @@ public function __construct(
      */
     public function execute()
     {
-        $expiration = $this->configCheckoutPro->getExpiredPaymentDate();
-
         $orders = $this->collectionFactory->create()
-                    ->addFieldToFilter('state', Order::STATE_NEW)
-                    ->addAttributeToFilter('created_at', [
-                        'lteq' => $expiration,
-                    ]);
+            ->addFieldToFilter('state', Order::STATE_NEW);
 
         $orders->getSelect()
-                ->join(
-                    ['sop' => 'sales_order_payment'],
-                    'main_table.entity_id = sop.parent_id',
-                    ['method']
-                )
-                ->where('sop.method = ?', ConfigCheckoutPro::METHOD);
+            ->join(
+                ['sop' => $this->getSalesOrderPaymentTableName()],
+                'main_table.entity_id = sop.parent_id',
+                ['method']
+            )
+            ->where(new \Zend_Db_Expr(
+                "sop.method = ? AND TIME_TO_SEC(TIMEDIFF(CURRENT_TIMESTAMP, CAST(JSON_EXTRACT(sop.additional_information, '$.date_of_expiration') AS DATETIME))) >= 0 "
+            ), ConfigCheckoutPro::METHOD);
 
         foreach ($orders as $order) {
             $orderId = $order->getEntityId();
@@ -100,7 +117,7 @@ public function execute()
             $order->cancel();
             $order->save();
             $this->logger->debug([
-                'fetch'   => 'Cancel Order Id '.$orderId,
+                'fetch'   => 'Cancel Order Id ' . $orderId,
             ]);
         }
     }

diff --git a/Cron/FetchPaymentMethodsOffOrderStatus.php b/Cron/FetchPaymentMethodsOffOrderStatus.php
@@ -2,6 +2,7 @@
 
 namespace MercadoPago\AdbPayment\Cron;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
@@ -28,21 +29,39 @@ class FetchPaymentMethodsOffOrderStatus
      */
     protected $collectionFactory;
 
+    /**
+     * @var ResourceConnection
+     */
+    protected $resource;
+
     /**
      * Constructor.
      *
      * @param Logger            $logger
      * @param FetchStatus       $fetchStatus
      * @param CollectionFactory $collectionFactory
+     * @param ResourceConnection $resource;
      */
     public function __construct(
         Logger $logger,
         FetchStatus $fetchStatus,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        ResourceConnection $resource
     ) {
         $this->logger = $logger;
         $this->fetchStatus = $fetchStatus;
         $this->collectionFactory = $collectionFactory;
+        $this->resource = $resource;
+    }
+
+    /**
+     * Get sales_order_payment table name.
+     *
+     * @return string
+     */
+    public function getSalesOrderPaymentTableName()
+    {
+        return $this->resource->getTableName('sales_order_payment');
     }
 
     /**
@@ -57,7 +76,7 @@ public function execute()
 
         $orders->getSelect()
                 ->join(
-                    ['sop' => 'sales_order_payment'],
+                    ['sop' => $this->getSalesOrderPaymentTableName()],
                     'main_table.entity_id = sop.parent_id',
                     ['method']
                 )

diff --git a/Cron/FetchPixOrderStatus.php b/Cron/FetchPixOrderStatus.php
@@ -8,6 +8,7 @@
 
 namespace MercadoPago\AdbPayment\Cron;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
@@ -34,21 +35,39 @@ class FetchPixOrderStatus
      */
     protected $collectionFactory;
 
+    /**
+     * @var ResourceConnection
+     */
+    protected $resource;
+
     /**
      * Constructor.
      *
      * @param Logger            $logger
      * @param FetchStatus       $fetchStatus
      * @param CollectionFactory $collectionFactory
+     * @param ResourceConnection $resource;
      */
     public function __construct(
         Logger $logger,
         FetchStatus $fetchStatus,
-        CollectionFactory $collectionFactory
+        CollectionFactory $collectionFactory,
+        ResourceConnection $resource
     ) {
         $this->logger = $logger;
         $this->fetchStatus = $fetchStatus;
         $this->collectionFactory = $collectionFactory;
+        $this->resource = $resource;
+    }
+
+    /**
+     * Get sales_order_payment table name.
+     *
+     * @return string
+     */
+    public function getSalesOrderPaymentTableName()
+    {
+        return $this->resource->getTableName('sales_order_payment');
     }
 
     /**
@@ -63,7 +82,7 @@ public function execute()
 
         $orders->getSelect()
                 ->join(
-                    ['sop' => 'sales_order_payment'],
+                    ['sop' => $this->getSalesOrderPaymentTableName()],
                     'main_table.entity_id = sop.parent_id',
                     ['method']
                 )