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

Author: Anna Bukatar

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

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Model\Plugin;
+
+use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
+use Magento\Persistent\Helper\Session as PersistentSession;
+
+class LoginAsCustomerCleanUp
+{
+    /**
+     * @var PersistentSession
+     */
+    private $persistentSession;
+
+    /**
+     * @param PersistentSession $persistentSession
+     */
+    public function __construct(PersistentSession $persistentSession)
+    {
+        $this->persistentSession = $persistentSession;
+    }
+
+    /**
+     * @param AuthenticateCustomerBySecretInterface $subject
+     * @param string $secret
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeExecute(AuthenticateCustomerBySecretInterface $subject, string $secret)
+    {
+        if ($this->persistentSession->isPersistent()) {
+            $this->persistentSession->getSession()->removePersistentCookie();
+        }
+        return $secret;
+    }
+}

app/code/Magento/Persistent/etc/frontend/di.xml

@@ -57,4 +57,7 @@
             <argument name="shippingAssignmentProcessor" xsi:type="object">Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor\Proxy</argument>
         </arguments>
     </type>
+    <type name="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface">
+        <plugin name="login_as_customer_cleanup" type="Magento\Persistent\Model\Plugin\LoginAsCustomerCleanUp" />
+    </type>
 </config>