Added scenario for locked customer and fixed some minors issues

Author: Usik2203

app/code/Magento/CustomerGraphQl/Model/Resolver/RequestPasswordResetEmail.php

@@ -8,7 +8,9 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\AccountManagement;
+use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -23,6 +25,16 @@
  */
 class RequestPasswordResetEmail implements ResolverInterface
 {
+    /**
+     * @var AuthenticationInterface
+     */
+    private $authentication;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @var AccountManagementInterface
      */
@@ -36,13 +48,19 @@ class RequestPasswordResetEmail implements ResolverInterface
     /**
      * RequestPasswordResetEmail constructor.
      *
-     * @param AccountManagementInterface $customerAccountManagement
-     * @param EmailValidator             $emailValidator
+     * @param AuthenticationInterface     $authentication
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AccountManagementInterface  $customerAccountManagement
+     * @param EmailValidator              $emailValidator
      */
     public function __construct(
+        AuthenticationInterface $authentication,
+        CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
         EmailValidator $emailValidator
     ) {
+        $this->authentication = $authentication;
+        $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->emailValidator = $emailValidator;
     }
@@ -76,13 +94,23 @@ public function resolve(
             throw new GraphQlInputException(__('Email is invalid'));
         }
 
+        try {
+            $customer = $this->customerRepository->get($args['email']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__('Cannot reset customer password'), $e);
+        }
+
+        if (true === $this->authentication->isLocked($customer->getId())) {
+            throw new GraphQlInputException(__("The current customer isn't authorized"));
+        }
+
         try {
             return $this->customerAccountManagement->initiatePasswordReset(
                 $args['email'],
                 AccountManagement::EMAIL_RESET
             );
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
+            throw new GraphQlInputException(__("Cannot reset customer password"), $e);
         }
     }
 }

app/code/Magento/CustomerGraphQl/Model/Resolver/ResetPassword.php

@@ -8,6 +8,8 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -17,6 +19,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Validator\EmailAddress as EmailValidator;
 
+/**
+ * Class Resolver for ResetPassword
+ */
 class ResetPassword implements ResolverInterface
 {
     /**
@@ -30,15 +35,31 @@ class ResetPassword implements ResolverInterface
     private $emailValidator;
 
     /**
-     * RequestPasswordResetEmail constructor.
+     * @var AuthenticationInterface
+     */
+    private $authentication;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * ResetPassword constructor.
      *
-     * @param AccountManagementInterface $customerAccountManagement
-     * @param EmailValidator             $emailValidator
+     * @param AuthenticationInterface     $authentication
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param AccountManagementInterface  $customerAccountManagement
+     * @param EmailValidator              $emailValidator
      */
     public function __construct(
+        AuthenticationInterface $authentication,
+        CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
         EmailValidator $emailValidator
     ) {
+        $this->authentication = $authentication;
+        $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->emailValidator = $emailValidator;
     }
@@ -80,14 +101,24 @@ public function resolve(
             throw new GraphQlInputException(__('newPassword must be specified'));
         }
 
+        try {
+            $customer = $this->customerRepository->get($args['email']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__('Cannot set customer password'), $e);
+        }
+
+        if (true === $this->authentication->isLocked($customer->getId())) {
+            throw new GraphQlInputException(__("The current customer isn't authorized"));
+        }
+
         try {
             return $this->customerAccountManagement->resetPassword(
                 $args['email'],
                 $args['resetPasswordToken'],
                 $args['newPassword']
             );
         } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()), $e);
+            throw new GraphQlInputException(__('Cannot set customer password'), $e);
         }
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RequestPasswordResetEmailTest.php

@@ -7,10 +7,22 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class RequestPasswordResetEmailTest extends GraphQlAbstract
 {
+    /**
+     * @var LockCustomer
+     */
+    private $lockCustomer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
+    }
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      */
@@ -30,6 +42,9 @@ public function testCustomerAccountWithEmailAvailable()
 
     /**
      * Check if customer account is not available
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cannot reset customer password
      */
     public function testCustomerAccountWithEmailNotAvailable()
     {
@@ -39,12 +54,14 @@ public function testCustomerAccountWithEmailNotAvailable()
   requestPasswordResetEmail(email: "[email protected]")
 }
 QUERY;
-        $this->assertMessage('No such entity with email = [email protected], websiteId = 1');
         $this->graphQlMutation($query);
     }
 
     /**
      * Check if email value empty
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Email must be specified
      */
     public function testEmailAvailableEmptyValue()
     {
@@ -53,12 +70,14 @@ public function testEmailAvailableEmptyValue()
   requestPasswordResetEmail(email: "")
 }
 QUERY;
-        $this->assertMessage('Email must be specified');
         $this->graphQlMutation($query);
     }
 
     /**
      * Check if email is invalid
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage Email is invalid
      */
     public function testEmailAvailableInvalidValue()
     {
@@ -67,35 +86,27 @@ public function testEmailAvailableInvalidValue()
   requestPasswordResetEmail(email: "invalid-email")
 }
 QUERY;
-        $this->assertMessage('Email is invalid');
         $this->graphQlMutation($query);
     }
 
     /**
-     * Check if email contain right type
+     * Check if email was sent for lock customer
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @expectedException \Exception
+     * @expectedExceptionMessage The current customer isn't authorized
      */
-    public function testEmailAvailableTypeValue()
+    public function testRequestPasswordResetEmailForLockCustomer()
     {
-        $query = <<<QUERY
+        $this->lockCustomer->execute(1);
+        $query =
+            <<<QUERY
 mutation {
-  requestPasswordResetEmail (email: 12345)
+  requestPasswordResetEmail(email: "[email protected]")
 }
 QUERY;
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage(
-            'GraphQL response contains errors: Field "requestPasswordResetEmail" argument "email" requires type String!'
-        );
-        $this->graphQlMutation($query);
-    }
 
-    /**
-     * Checks Exception and ExceptionMessages
-     *
-     * @param $message
-     */
-    private function assertMessage($message)
-    {
-        self::expectException(\Exception::class);
-        self::expectExceptionMessage("GraphQL response contains errors: {$message}");
+        $this->graphQlMutation($query);
     }
 }