fix confirm customer by token

Author: engcom-Charlie

app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php

@@ -7,7 +7,9 @@
 
 namespace Magento\Customer\Model\ForgotPasswordToken;
 
-use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Confirm customer by reset password token
@@ -20,37 +22,47 @@ class ConfirmCustomerByToken
     private $getByToken;
 
     /**
-     * @var CustomerResource
+     * @var CustomerRepositoryInterface
      */
-    private $customerResource;
+    private $customerRepository;
 
     /**
-     * ConfirmByToken constructor.
-     *
      * @param GetCustomerByToken $getByToken
-     * @param CustomerResource $customerResource
+     * @param CustomerRepositoryInterface $customerRepository
      */
-    public function __construct(
-        GetCustomerByToken $getByToken,
-        CustomerResource $customerResource
-    ) {
+    public function __construct(GetCustomerByToken $getByToken, CustomerRepositoryInterface $customerRepository)
+    {
         $this->getByToken = $getByToken;
-        $this->customerResource = $customerResource;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
      * Confirm customer account my rp_token
      *
      * @param string $resetPasswordToken
-     *
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function execute(string $resetPasswordToken): void
     {
         $customer = $this->getByToken->execute($resetPasswordToken);
         if ($customer->getConfirmation()) {
-            $this->customerResource->updateColumn($customer->getId(), 'confirmation', null);
+            $this->resetConfirmation($customer);
         }
     }
+
+    /**
+     * Reset customer confirmation
+     *
+     * @param CustomerInterface $customer
+     * @return void
+     */
+    private function resetConfirmation(CustomerInterface $customer): void
+    {
+        // skip unnecessary address and customer validation
+        $customer->setData('ignore_validation_flag', true);
+        $customer->setConfirmation(null);
+
+        $this->customerRepository->save($customer);
+    }
 }

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

@@ -403,20 +403,4 @@ public function changeResetPasswordLinkToken(\Magento\Customer\Model\Customer $c
         }
         return $this;
     }
-
-    /**
-     * @param int $customerId
-     * @param string $column
-     * @param string $value
-     */
-    public function updateColumn($customerId, $column, $value)
-    {
-        $this->getConnection()->update(
-            $this->getTable('customer_entity'),
-            [$column => $value],
-            [$this->getEntityIdField() . ' = ?' => $customerId]
-        );
-
-        return $this;
-    }
 }

app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/ConfirmCustomerByTokenTest.php

@@ -7,11 +7,10 @@
 
 namespace Magento\Customer\Test\Unit\Model\ForgotPasswordToken;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Model\ForgotPasswordToken\GetCustomerByToken;
-use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
-use Magento\Customer\Model\ResourceModel\Customer;
 use Magento\Customer\Model\ForgotPasswordToken\ConfirmCustomerByToken;
+use Magento\Customer\Model\ForgotPasswordToken\GetCustomerByToken;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -33,22 +32,26 @@ class ConfirmCustomerByTokenTest extends TestCase
     private $customerMock;
 
     /**
-     * @var CustomerResource|MockObject
+     * @var CustomerRepositoryInterface|MockObject
      */
-    private $customerResourceMock;
+    private $customerRepositoryMock;
 
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
-        $this->customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
-        $this->customerResourceMock = $this->createMock(CustomerResource::class);
+        $this->customerMock = $this->getMockBuilder(CustomerInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setData'])
+            ->getMockForAbstractClass();
+
+        $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);
 
         $getCustomerByTokenMock = $this->createMock(GetCustomerByToken::class);
         $getCustomerByTokenMock->method('execute')->willReturn($this->customerMock);
 
-        $this->model = new ConfirmCustomerByToken($getCustomerByTokenMock, $this->customerResourceMock);
+        $this->model = new ConfirmCustomerByToken($getCustomerByTokenMock, $this->customerRepositoryMock);
     }
 
     /**
@@ -58,17 +61,18 @@ protected function setUp(): void
      */
     public function testExecuteWithConfirmation(): void
     {
-        $customerId = 777;
-
         $this->customerMock->expects($this->once())
             ->method('getConfirmation')
             ->willReturn('GWz2ik7Kts517MXAgrm4DzfcxKayGCm4');
         $this->customerMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($customerId);
-        $this->customerResourceMock->expects($this->once())
-            ->method('updateColumn')
-            ->with($customerId, 'confirmation', null);
+            ->method('setData')
+            ->with('ignore_validation_flag', true);
+        $this->customerMock->expects($this->once())
+            ->method('setConfirmation')
+            ->with(null);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($this->customerMock);
 
         $this->model->execute(self::STUB_RESET_PASSWORD_TOKEN);
     }
@@ -83,8 +87,8 @@ public function testExecuteWithoutConfirmation(): void
         $this->customerMock->expects($this->once())
             ->method('getConfirmation')
             ->willReturn(null);
-        $this->customerResourceMock->expects($this->never())
-            ->method('updateColumn');
+        $this->customerRepositoryMock->expects($this->never())
+            ->method('save');
 
         $this->model->execute(self::STUB_RESET_PASSWORD_TOKEN);
     }