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

Author: chittima

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;
+    }
+
+    /**
+     * Disable persistence for sales representative login
+     *
+     * @param AuthenticateCustomerBySecretInterface $subject
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(AuthenticateCustomerBySecretInterface $subject)
+    {
+        if ($this->persistentSession->isPersistent()) {
+            $this->persistentSession->getSession()->removePersistentCookie();
+        }
+    }
+}

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

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\Model\Plugin;
+
+use Magento\Persistent\Model\Plugin\LoginAsCustomerCleanUp;
+use Magento\Persistent\Helper\Session as PersistentSession;
+use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class LoginAsCustomerCleanUpTest extends TestCase
+{
+    /**
+     * @var LoginAsCustomerCleanUp
+     */
+    protected $plugin;
+
+    /**
+     * @var MockObject
+     */
+    protected $subjectMock;
+
+    /**
+     * @var MockObject
+     */
+    protected $persistentSessionMock;
+
+    /**
+     * @var MockObject
+     */
+    protected $persistentSessionModelMock;
+
+    protected function setUp(): void
+    {
+        $this->persistentSessionMock = $this->createMock(PersistentSession::class);
+        $this->persistentSessionModelMock = $this->createMock(\Magento\Persistent\Model\Session::class);
+        $this->persistentSessionMock->method('getSession')->willReturn($this->persistentSessionModelMock);
+        $this->subjectMock = $this->createMock(AuthenticateCustomerBySecretInterface::class);
+        $this->plugin = new LoginAsCustomerCleanUp($this->persistentSessionMock);
+    }
+
+    public function testBeforeExecute()
+    {
+        $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(true);
+        $this->persistentSessionModelMock->expects($this->once())->method('removePersistentCookie');
+        $result = $this->plugin->afterExecute($this->subjectMock);
+        $this->assertEquals(null, $result);
+    }
+}

app/code/Magento/Persistent/composer.json

@@ -14,6 +14,9 @@
         "magento/module-quote": "*",
         "magento/module-store": "*"
     },
+    "suggest": {
+        "magento/module-login-as-customer-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",

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>