ACP2E-2259: Dynamic Blocks based on Customer Segments don't work correctly (Double Banner after Sign Out when using Segment)

Author: Anna Bukatar

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,11 @@ private function isPostRequest(): bool
         return $this->request instanceof HttpRequestInterface && $this->request->isPost();
     }
 
+    private function isLogoutRequest(): bool
+    {
+        return $this->request->getRequestUri() === '/customer/account/logout/';
+    }
+
     /**
      * Check if the current application area is frontend.
      *

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

@@ -84,6 +84,7 @@ protected function setUp(): void
         $this->customerRepositoryMock = $this->getMockForAbstractClass(CustomerRepositoryInterface::class);
         $this->actionMock = $this->getMockForAbstractClass(ActionInterface::class);
         $this->requestMock = $this->getMockBuilder(RequestStubInterface::class)
+            ->addMethods(['getRequestUri'])
             ->getMockForAbstractClass();
         $this->requestMock->method('isPost')->willReturn(true);
 
@@ -153,4 +154,15 @@ public function testBeforeDispatchWithNoCustomerFound()
 
         $this->plugin->beforeExecute($this->actionMock);
     }
+
+    public function testBeforeExecuteForLogoutRequest()
+    {
+        $this->requestMock->method('getRequestUri')->willReturn('/customer/account/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);
+    }
 }