ENGCOM-7527: #26288 Throw an exception when a customer does not exist requests password reset #27269

Author: gabrieldagama

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

@@ -73,7 +73,7 @@ public function execute(string $resetPasswordToken):CustomerInterface
         }
         if ($found->getTotalCount() === 0) {
             //Customer with such token not found.
-            new NoSuchEntityException(
+            throw new NoSuchEntityException(
                 new Phrase(
                     'No such entity with rp_token = %value',
                     [

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

@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model\ForgotPasswordToken;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerSearchResultsInterface;
+use Magento\Customer\Model\ForgotPasswordToken\GetCustomerByToken;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\ExpiredException;
+use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class GetCustomerByTokenTest extends TestCase
+{
+    private const RESET_PASSWORD = 'resetPassword';
+
+    /**
+     * @var SearchCriteriaBuilder|MockObject
+     */
+    private $searchCriteriaBuilderMock;
+
+    /**
+     * @var SearchCriteria|MockObject
+     */
+    private $searchCriteriaMock;
+
+    /**
+     * @var CustomerRepositoryInterface|MockObject
+     */
+    private $customerRepositoryMock;
+
+    /**
+     * @var CustomerSearchResultsInterface|MockObject
+     */
+    private $searchResultMock;
+
+    /**
+     * @var CustomerInterface|MockObject
+     */
+    private $customerMock;
+
+    /**
+     * @var GetCustomerByToken;
+     */
+    private $model;
+
+    protected function setUp(): void
+    {
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+        $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $this->searchResultMock = $this->createMock(CustomerSearchResultsInterface::class);
+        $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);
+        $this->customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            GetCustomerByToken::class,
+            [
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'customerRepository' => $this->customerRepositoryMock
+            ]
+        );
+
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->searchResultMock);
+    }
+
+    public function testExecuteReturnWhenOneItemAvailable(): void
+    {
+        $totalCount = 1;
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
+        $this->searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->customerMock]);
+
+        $this->assertInstanceOf(
+            CustomerInterface::class,
+            $this->model->execute(self::RESET_PASSWORD)
+        );
+    }
+
+    public function testExecuteWithNoSuchEntityException(): void
+    {
+        $totalCount = 0;
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
+        $this->expectExceptionObject(new NoSuchEntityException(
+            new Phrase(
+                'No such entity with rp_token = %value',
+                ['value' => self::RESET_PASSWORD]
+            )
+        ));
+
+        $this->model->execute(self::RESET_PASSWORD);
+    }
+
+    public function testExecuteWithExpireException(): void
+    {
+        $totalCount = 2;
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
+
+        $this->expectExceptionObject(new ExpiredException(
+            new Phrase(
+                'Reset password token expired.'
+            )
+        ));
+
+        $this->model->execute(self::RESET_PASSWORD);
+    }
+}

dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\ForgotPasswordToken;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class GetCustomerByTokenTest extends TestCase
+{
+    private const RESET_PASSWORD = '8ed8677e6c79e68b94e61658bd756ea5';
+
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /**
+     * @var GetCustomerByToken
+     */
+    private $customerByToken;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->customerByToken = $this->objectManager->get(GetCustomerByToken::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWithNoSuchEntityException(): void
+    {
+        self::expectException(NoSuchEntityException::class);
+        self::expectExceptionMessage('No such entity with rp_token = ' . self::RESET_PASSWORD);
+        $this->customerByToken->execute(self::RESET_PASSWORD);
+    }
+}