Merge branch 'ACP2E-2259' of https://github.com/magento-l3/magento2ce into PR-VK-2023-09-29

Author: vkolesny

app/code/Magento/Customer/Model/Plugin/CustomerNotification.php

@@ -110,6 +110,7 @@ public function beforeExecute(ActionInterface $subject)
 
         if (!$this->isFrontendRequest()
             || !$this->isPostRequest()
+            || $this->isLogoutRequest()
             || !$this->isSessionUpdateRegisteredFor($customerId)) {
             return;
         }
@@ -146,6 +147,18 @@ private function isPostRequest(): bool
         return $this->request instanceof HttpRequestInterface && $this->request->isPost();
     }
 
+    /**
+     * Checks if the current request is a logout request.
+     *
+     * @return bool
+     */
+    private function isLogoutRequest(): bool
+    {
+        return $this->request->getRouteName() === 'customer'
+            && $this->request->getControllerName() === 'account'
+            && $this->request->getActionName() === 'logout';
+    }
+
     /**
      * Check if the current application area is frontend.
      *

app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerNotificationTest.php

@@ -21,6 +21,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\Session\StorageInterface;
+use Magento\Framework\App\Request\Http as RequestHttp;
 
 /**
  * Unit test for CustomerNotification plugin
@@ -83,8 +84,7 @@ protected function setUp(): void
 
         $this->customerRepositoryMock = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
         $this->actionMock = $this->getMockForAbstractClass(ActionInterface::class);
-        $this->requestMock = $this->getMockBuilder(RequestStubInterface::class)
-            ->getMockForAbstractClass();
+        $this->requestMock = $this->createMock(RequestHttp::class);
         $this->requestMock->method('isPost')->willReturn(true);
 
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
@@ -153,4 +153,17 @@ public function testBeforeDispatchWithNoCustomerFound()
 
         $this->plugin->beforeExecute($this->actionMock);
     }
+
+    public function testBeforeExecuteForLogoutRequest()
+    {
+        $this->requestMock->method('getRouteName')->willReturn('customer');
+        $this->requestMock->method('getControllerName')->willReturn('account');
+        $this->requestMock->method('getActionName')->willReturn('logout');
+
+        $this->sessionMock->expects($this->never())->method('regenerateId');
+        $this->sessionMock->expects($this->never())->method('setCustomerData');
+        $this->sessionMock->expects($this->never())->method('setCustomerGroupId');
+
+        $this->plugin->beforeExecute($this->actionMock);
+    }
 }