ACP2E-1972: revert loginpost

Author: alzota

app/code/Magento/Customer/Controller/Account/LoginPost.php

@@ -13,25 +13,22 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\App\CsrfAwareActionInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\InvalidRequestException;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Customer\Controller\AbstractAccount;
 use Magento\Framework\Phrase;
-use Magento\Framework\Session\Generic;
 
 /**
  * Post login customer action.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.ElseExpression)
- * phpcs:disable Magento2.Annotation.MethodAnnotationStructure.InvalidDeprecatedTagUsage
  */
 class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
 {
@@ -75,35 +72,27 @@ class LoginPost extends AbstractAccount implements CsrfAwareActionInterface, Htt
      */
     private $customerUrl;
 
-    /**
-     * @var Generic
-     */
-    private $generic;
-
     /**
      * @param Context $context
      * @param Session $customerSession
      * @param AccountManagementInterface $customerAccountManagement
      * @param CustomerUrl $customerHelperData
      * @param Validator $formKeyValidator
      * @param AccountRedirect $accountRedirect
-     * @param Generic $generic
      */
     public function __construct(
         Context $context,
         Session $customerSession,
         AccountManagementInterface $customerAccountManagement,
         CustomerUrl $customerHelperData,
         Validator $formKeyValidator,
-        AccountRedirect $accountRedirect,
-        Generic $generic = null
+        AccountRedirect $accountRedirect
     ) {
         $this->session = $customerSession;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->customerUrl = $customerHelperData;
         $this->formKeyValidator = $formKeyValidator;
         $this->accountRedirect = $accountRedirect;
-        $this->generic = $generic ?? ObjectManager::getInstance()->get(Generic::class);
         parent::__construct($context);
     }
 
@@ -199,7 +188,6 @@ public function execute()
             $login = $this->getRequest()->getPost('login');
             if (!empty($login['username']) && !empty($login['password'])) {
                 try {
-                    $this->generic->setVisitorData([]);
                     $customer = $this->customerAccountManagement->authenticate($login['username'], $login['password']);
                     $this->session->setCustomerDataAsLoggedIn($customer);
                     if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {

app/code/Magento/Customer/Test/Unit/Controller/Account/LoginPostTest.php

@@ -24,7 +24,6 @@
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Session\Generic;
 use Magento\Framework\Stdlib\Cookie\CookieMetadata;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
@@ -103,11 +102,6 @@ class LoginPostTest extends TestCase
      */
     protected $scopeConfig;
 
-    /**
-     * @var Generic|MockObject
-     */
-    private $generic;
-
     protected function setUp(): void
     {
         $this->prepareContext();
@@ -141,18 +135,13 @@ protected function setUp(): void
         $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMockForAbstractClass();
 
-        $this->generic = $this->getMockBuilder(Generic::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->controller = new LoginPost(
             $this->context,
             $this->session,
             $this->accountManagement,
             $this->url,
             $this->formkeyValidator,
-            $this->accountRedirect,
-            $this->generic
+            $this->accountRedirect
         );
         $reflection = new \ReflectionClass(get_class($this->controller));
         $reflectionProperty = $reflection->getProperty('scopeConfig');