GraphQl-673: Add email validity check on isEmailAvailable query, and add test coverage for negative cases

Author: Matthew O'Loughlin

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

@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Validator\EmailAddress as EmailValidator;
 
 /**
  * Is Customer Email Available
@@ -24,13 +25,21 @@ class IsEmailAvailable implements ResolverInterface
      */
     private $accountManagement;
 
+    /**
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
     /**
      * @param AccountManagementInterface $accountManagement
+     * @param EmailValidator $emailValidator
      */
     public function __construct(
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        EmailValidator $emailValidator
     ) {
         $this->accountManagement = $accountManagement;
+        $this->emailValidator = $emailValidator;
     }
 
     /**
@@ -44,7 +53,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($args['email']) || empty($args['email'])) {
-            throw new GraphQlInputException(__('"Email should be specified'));
+            throw new GraphQlInputException(__('Email should be specified'));
+        }
+
+        if (!$this->emailValidator->isValid($args['email'])) {
+            throw new GraphQlInputException(__('Email is invalid'));
         }
 
         try {

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

@@ -47,4 +47,55 @@ public function testEmailAvailable()
         self::assertArrayHasKey('is_email_available', $response['isEmailAvailable']);
         self::assertTrue($response['isEmailAvailable']['is_email_available']);
     }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage GraphQL response contains errors: Email should be specified
+     */
+    public function testEmailAvailableEmptyValue()
+    {
+        $query =
+            <<<QUERY
+{
+  isEmailAvailable(email: "") {
+    is_email_available
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage GraphQL response contains errors: Field "isEmailAvailable" argument "email" of type "String!" is required but not provided.
+     */
+    public function testEmailAvailableMissingValue()
+    {
+        $query =
+            <<<QUERY
+{
+  isEmailAvailable {
+    is_email_available
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage GraphQL response contains errors: Email is invalid
+     */
+    public function testEmailAvailableInvalidValue()
+    {
+        $query =
+            <<<QUERY
+{
+  isEmailAvailable(email: "invalid-email") {
+    is_email_available
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+    }
 }