ACP2E-1763: Issue with Cart when logged in as customer from admin

Author: Anna Bukatar

app/code/Magento/Persistent/Model/Plugin/LoginAsCustomerCleanUp.php

@@ -26,18 +26,16 @@ public function __construct(PersistentSession $persistentSession)
     }
 
     /**
-     * Cleans persistence cookie on sales representative login
+     * Disable persistence for sales representative login
      *
      * @param AuthenticateCustomerBySecretInterface $subject
-     * @param string $secret
-     * @return string
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeExecute(AuthenticateCustomerBySecretInterface $subject, string $secret)
+    public function afterExecute(AuthenticateCustomerBySecretInterface $subject)
     {
         if ($this->persistentSession->isPersistent()) {
             $this->persistentSession->getSession()->removePersistentCookie();
         }
-        return $secret;
     }
 }

app/code/Magento/Persistent/Test/Unit/Model/Plugin/LoginAsCustomerCleanUpTest.php

@@ -46,10 +46,9 @@ protected function setUp(): void
 
     public function testBeforeExecute()
     {
-        $key = 'key';
         $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->persistentSessionModelMock->expects($this->once())->method('removePersistentCookie');
-        $result = $this->plugin->beforeExecute($this->subjectMock, $key);
-        $this->assertEquals($key, $result);
+        $result = $this->plugin->afterExecute($this->subjectMock);
+        $this->assertEquals(null, $result);
     }
 }