ACP2E-1972: check correct visitor created_At

Author: alzota

app/code/Magento/Customer/Model/ResourceModel/Visitor.php

@@ -110,7 +110,8 @@ public function fetchCreatedAt(int $visitorId): ?int
             ['created_at' => 'visitor_table.created_at']
         )->where(
             'visitor_table.visitor_id = ?',
-            (string) $visitorId
+            $visitorId,
+            \Zend_Db::BIGINT_TYPE
         )->limit(
             1
         );
@@ -121,6 +122,62 @@ public function fetchCreatedAt(int $visitorId): ?int
         return strtotime($lookup['created_at']);
     }
 
+    /**
+     * Gets created at value for the visitor id by customer id
+     *
+     * @param int $customerId
+     * @return int|null
+     */
+    public function fetchCreatedAtByCustomer(int $customerId): ?int
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from(
+            ['visitor_table' => $this->getTable('customer_visitor')],
+            ['created_at' => 'visitor_table.created_at']
+        )->where(
+            'visitor_table.customer_id = ?',
+            $customerId,
+            \Zend_Db::INT_TYPE
+        )->order(
+            'visitor_table.visitor_id DESC'
+        )->limit(
+            1
+        );
+        $lookup = $connection->fetchRow($select);
+        if (empty($lookup) || $lookup['created_at'] == null) {
+            return null;
+        }
+        return strtotime($lookup['created_at']);
+    }
+
+    /**
+     * Gets created at value for the visitor id by customer id
+     *
+     * @param int $customerId
+     * @return int|null
+     */
+    public function fetchLastVisitAtByCustomer(int $customerId): ?int
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()->from(
+            ['visitor_table' => $this->getTable('customer_visitor')],
+            ['last_visit_at' => 'visitor_table.last_visit_at']
+        )->where(
+            'visitor_table.customer_id = ?',
+            $customerId,
+            \Zend_Db::INT_TYPE
+        )->order(
+            'visitor_table.visitor_id DESC'
+        )->limit(
+            1
+        );
+        $lookup = $connection->fetchRow($select);
+        if (empty($lookup) || $lookup['last_visit_at'] == null) {
+            return null;
+        }
+        return strtotime($lookup['last_visit_at']);
+    }
+
     /**
      * Update visitor session created at column value
      *
@@ -136,4 +193,20 @@ public function updateCreatedAt(int $visitorId, int $timestamp): void
             $this->getConnection()->quoteInto('visitor_id = ?', $visitorId)
         );
     }
+
+    /**
+     * Update visitor session visitor id column value
+     *
+     * @param int $visitorId
+     * @param int $customerId
+     * @return void
+     */
+    public function updateCustomerId(int $visitorId, int $customerId): void
+    {
+        $this->getConnection()->update(
+            $this->getTable('customer_visitor'),
+            ['customer_id' => $customerId],
+            $this->getConnection()->quoteInto('visitor_id = ?', $visitorId)
+        );
+    }
 }

app/code/Magento/Customer/Model/Session/SessionCleaner.php

@@ -98,9 +98,10 @@ public function clearFor(int $customerId): void
         $timestamp = $dateTime->getTimestamp();
         $this->customerResourceModel->updateSessionCutOff($customerId, $timestamp);
         if ($this->sessionManager->getVisitorData() !== null) {
+
             $visitorId = $this->sessionManager->getVisitorData()['visitor_id'];
+            $this->visitorResourceModel->updateCustomerId((int) $visitorId, $customerId);
             $this->visitorResourceModel->updateCreatedAt((int) $visitorId, $timestamp + 1);
         }
     }
 }
-

app/code/Magento/Customer/Model/Session/Validators/CutoffValidator.php

@@ -68,6 +68,11 @@ public function validate(SessionManagerInterface $session): void
             ) {
                 $cutoff = $this->customerResource->findSessionCutOff((int) $visitor['customer_id']);
                 $sessionCreationTime = $this->visitorResource->fetchCreatedAt((int) $visitor['visitor_id']);
+                $secondSessionCreationTime = $this->visitorResource->fetchCreatedAtByCustomer((int) $visitor['customer_id']);
+
+                if ($secondSessionCreationTime > $sessionCreationTime) {
+                    $sessionCreationTime = $secondSessionCreationTime;
+                }
                 if (isset($cutoff, $sessionCreationTime) && $cutoff > $sessionCreationTime) {
                     throw new SessionException(
                         new Phrase('The session has expired, please login again.')