lynx-232: Revert changes using registry, use repository instead

Author: eliseacornejo

app/code/Magento/Customer/Model/AccountManagement/Authenticate.php

@@ -19,12 +19,10 @@
 namespace Magento\Customer\Model\AccountManagement;
 
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Model\AccountConfirmation;
 use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Customer\Model\Customer;
-use Magento\Customer\Model\CustomerRegistry;
-use Magento\Framework\Api\DataObjectHelper;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
@@ -40,19 +38,14 @@
 class Authenticate
 {
     /**
-     * @var CustomerRegistry
+     * @var CustomerRepository
      */
-    private CustomerRegistry $customerRegistry;
+    private CustomerRepository $customerRepository;
 
     /**
-     * @var DataObjectHelper
+     * @var CustomerFactory
      */
-    private DataObjectHelper $dataObjectHelper;
-
-    /**
-     * @var CustomerInterfaceFactory
-     */
-    private CustomerInterfaceFactory $customerFactory;
+    private CustomerFactory $customerFactory;
 
     /**
      * @var AuthenticationInterface
@@ -70,23 +63,20 @@ class Authenticate
     private ManagerInterface $eventManager;
 
     /**
-     * @param CustomerRegistry $customerRegistry
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerInterfaceFactory $customerFactory
+     * @param CustomerRepository $customerRepository
+     * @param CustomerFactory $customerFactory
      * @param AuthenticationInterface $authentication
      * @param AccountConfirmation $accountConfirmation
      * @param ManagerInterface $eventManager
      */
     public function __construct(
-        CustomerRegistry $customerRegistry,
-        DataObjectHelper $dataObjectHelper,
-        CustomerInterfaceFactory $customerFactory,
+        CustomerRepository $customerRepository,
+        CustomerFactory $customerFactory,
         AuthenticationInterface $authentication,
         AccountConfirmation $accountConfirmation,
         ManagerInterface $eventManager
     ) {
-        $this->customerRegistry = $customerRegistry;
-        $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerRepository = $customerRepository;
         $this->customerFactory = $customerFactory;
         $this->authentication = $authentication;
         $this->accountConfirmation = $accountConfirmation;
@@ -104,11 +94,10 @@ public function __construct(
     public function execute(string $email, string $password): CustomerInterface
     {
         try {
-            $customerModel = $this->customerRegistry->retrieveByEmail($email);
+            $customer = $this->customerRepository->get($email);
         } catch (NoSuchEntityException $exception) {
             throw new InvalidEmailOrPasswordException(__('Invalid login or password.'));
         }
-        $customer = $this->getCustomerDataObject($customerModel);
 
         $customerId = $customer->getId();
         if ($this->authentication->isLocked($customerId)) {
@@ -125,6 +114,7 @@ public function execute(string $email, string $password): CustomerInterface
             throw new EmailNotConfirmedException(__('This account isn\'t confirmed. Verify and try again.'));
         }
 
+        $customerModel = $this->customerFactory->create()->updateData($customer);
         $this->eventManager->dispatch(
             'customer_customer_authenticated',
             ['model' => $customerModel, 'password' => $password]
@@ -135,24 +125,6 @@ public function execute(string $email, string $password): CustomerInterface
         return $customer;
     }
 
-    /**
-     * Convert custom model to DTO
-     *
-     * @param Customer $customerModel
-     * @return CustomerInterface
-     */
-    private function getCustomerDataObject(Customer $customerModel): CustomerInterface
-    {
-        $customerDataObject = $this->customerFactory->create();
-        $this->dataObjectHelper->populateWithArray(
-            $customerDataObject,
-            $customerModel->getData(),
-            CustomerInterface::class
-        );
-        $customerDataObject->setId($customerModel->getId());
-        return $customerDataObject;
-    }
-
     /**
      * Check if accounts confirmation is required in config
      *

app/code/Magento/Customer/Model/Session.php

@@ -107,11 +107,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      */
     private $accountConfirmation;
 
-    /**
-     * @var CustomerRegistry
-     */
-    private $customerRegistry;
-
     /**
      * Session constructor.
      *
@@ -137,7 +132,6 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\App\Response\Http $response
      * @param AccountConfirmation $accountConfirmation
-     * @param CustomerRegistry $customerRegistry
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -163,8 +157,7 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         GroupManagementInterface $groupManagement,
         \Magento\Framework\App\Response\Http $response,
-        AccountConfirmation $accountConfirmation = null,
-        CustomerRegistry $customerRegistry = null
+        AccountConfirmation $accountConfirmation = null
     ) {
         $this->_coreUrl = $coreUrl;
         $this->_customerUrl = $customerUrl;
@@ -180,8 +173,6 @@ public function __construct(
         $this->response = $response;
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
-        $this->customerRegistry = $customerRegistry ?: ObjectManager::getInstance()
-            ->get(CustomerRegistry::class);
         parent::__construct(
             $request,
             $sidResolver,
@@ -440,7 +431,7 @@ public function checkCustomerId($customerId)
         }
 
         try {
-            $this->customerRegistry->retrieve($customerId);
+            $this->customerRepository->getById($customerId);
             $this->_isCustomerIdChecked = $customerId;
             return true;
         } catch (\Exception $e) {

app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php

@@ -9,11 +9,8 @@
 
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Customer\Model\Customer;
-use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Customer\Model\Session;
-use Magento\Framework\Api\DataObjectHelper;
 use Magento\GraphQl\Model\Query\ContextParametersInterface;
 use Magento\GraphQl\Model\Query\UserContextParametersProcessorInterface;
 
@@ -25,47 +22,31 @@ class AddUserInfoToContext implements UserContextParametersProcessorInterface
     /**
      * @var UserContextInterface
      */
-    private UserContextInterface $userContext;
+    private $userContext;
 
     /**
      * @var Session
      */
-    private Session $session;
+    private $session;
 
     /**
-     * @var CustomerRegistry
+     * @var CustomerRepository
      */
-    private CustomerRegistry $customerRegistry;
-
-    /**
-     * @var DataObjectHelper
-     */
-    private DataObjectHelper $dataObjectHelper;
-
-    /**
-     * @var CustomerInterfaceFactory
-     */
-    private CustomerInterfaceFactory $customerFactory;
+    private CustomerRepository $customerRepository;
 
     /**
      * @param UserContextInterface $userContext
      * @param Session $session
-     * @param CustomerRegistry $customerRegistry
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CustomerInterfaceFactory $customerFactory
+     * @param CustomerRepository $customerRepository
      */
     public function __construct(
         UserContextInterface $userContext,
         Session $session,
-        CustomerRegistry $customerRegistry,
-        DataObjectHelper $dataObjectHelper,
-        CustomerInterfaceFactory $customerFactory
+        CustomerRepository $customerRepository
     ) {
         $this->userContext = $userContext;
         $this->session = $session;
-        $this->customerRegistry = $customerRegistry;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->customerFactory = $customerFactory;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -97,31 +78,13 @@ public function execute(ContextParametersInterface $contextParameters): ContextP
         $contextParameters->addExtensionAttribute('is_customer', $isCustomer);
 
         if ($isCustomer) {
-            $customer = $this->customerRegistry->retrieve($currentUserId);
-            $this->session->setCustomerData($this->getCustomerDataObject($customer));
+            $customer = $this->customerRepository->getById($currentUserId);
+            $this->session->setCustomerData($customer);
             $this->session->setCustomerGroupId($customer->getGroupId());
         }
         return $contextParameters;
     }
 
-    /**
-     * Convert custom model to DTO
-     *
-     * @param Customer $customerModel
-     * @return CustomerInterface
-     */
-    private function getCustomerDataObject(Customer $customerModel): CustomerInterface
-    {
-        $customerDataObject = $this->customerFactory->create();
-        $this->dataObjectHelper->populateWithArray(
-            $customerDataObject,
-            $customerModel->getData(),
-            CustomerInterface::class
-        );
-        $customerDataObject->setId($customerModel->getId());
-        return $customerDataObject;
-    }
-
     /**
      * Get logged in customer data
      *