Merge branch 'ACP2E-1972' of https://github.com/magento-l3/magento2ce into PR-07032023

Author: chittima

app/code/Magento/Customer/Observer/Visitor/InitByRequestObserver.php

@@ -6,21 +6,44 @@
 
 namespace Magento\Customer\Observer\Visitor;
 
+use Magento\Customer\Model\Visitor;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\Session\SessionManagerInterface;
 
 /**
  * Visitor Observer
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class InitByRequestObserver extends AbstractVisitorObserver
 {
     /**
-     * initByRequest
+     * @var SessionManagerInterface
+     */
+    private $sessionManager;
+
+    /**
+     * @param Visitor $visitor
+     * @param SessionManagerInterface $sessionManager
+     */
+    public function __construct(
+        Visitor $visitor,
+        SessionManagerInterface $sessionManager
+    ) {
+        parent::__construct($visitor);
+        $this->sessionManager = $sessionManager;
+    }
+
+    /**
+     * Init visitor by request
      *
      * @param Observer $observer
      * @return void
      */
     public function execute(Observer $observer)
     {
+        if ($observer->getRequest()->getFullActionName() === 'customer_account_loginPost') {
+            $this->sessionManager->setVisitorData(['do_customer_login' => true]);
+        }
         $this->visitor->initByRequest($observer);
     }
 }

dev/tests/integration/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Phrase;
+use Magento\Framework\Session\Generic;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 
@@ -33,6 +34,11 @@ class LoginPostTest extends AbstractController
      */
     private $customerUrl;
 
+    /**
+     * @var Generic
+     */
+    private $generic;
+
     /**
      * @inheritdoc
      */
@@ -43,6 +49,7 @@ protected function setUp(): void
         $this->session = $this->_objectManager->get(Session::class);
         $this->urlEncoder = $this->_objectManager->get(EncoderInterface::class);
         $this->customerUrl = $this->_objectManager->get(Url::class);
+        $this->generic = $this->_objectManager->get(Generic::class);
     }
 
     /**
@@ -220,6 +227,25 @@ public function testNoFormKeyLoginPostAction(): void
         );
     }
 
+    /**
+     * @magentoConfigFixture current_store customer/startup/redirect_dashboard 1
+     * @magentoConfigFixture current_store customer/captcha/enable 0
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testVisitorForCustomerLoginPostAction(): void
+    {
+        $this->assertEmpty($this->generic->getVisitorData());
+        $this->prepareRequest('customer@example.com', 'password');
+        $this->dispatch('customer/account/loginPost');
+        $this->assertTrue($this->session->isLoggedIn());
+        $this->assertRedirect($this->stringContains('customer/account/'));
+        $this->assertNotEmpty($this->generic->getVisitorData()['visitor_id']);
+        $this->assertNotEmpty($this->generic->getVisitorData()['customer_id']);
+    }
+
     /**
      * Prepare request
      *