ENGCOM-3446: magento2#222 Apply changes from CR for PR 162 #225

 - Merge Pull Request magento/graphql-ce#225 from DocSchoko/graphql-ce:222-Apply-CR-fixes-for-pull-request-162
 - Merged commits:
   1. 3f5bcdd
   2. cbd6203
   3. 010220c
   4. 7f61b6f

Author: magento-engcom-team

app/code/Magento/CustomerGraphQl/Model/Customer/UpdateAccountInformation.php

@@ -73,7 +73,7 @@ public function execute(int $customerId, array $data): void
 
         if (isset($data['email']) && $customer->getEmail() !== $data['email']) {
             if (!isset($data['password']) || empty($data['password'])) {
-                throw new GraphQlInputException(__('For changing "email" you should provide current "password".'));
+                throw new GraphQlInputException(__('Provide the current "password" to change "email".'));
             }
 
             $this->checkCustomerPassword->execute($data['password'], $customerId);

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

@@ -17,7 +17,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * @inheritdoc
+ * Change customer password resolver
  */
 class ChangePassword implements ResolverInterface
 {
@@ -70,11 +70,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($args['currentPassword'])) {
-            throw new GraphQlInputException(__('"currentPassword" value should be specified'));
+            throw new GraphQlInputException(__('Specify the "currentPassword" value.'));
         }
 
         if (!isset($args['newPassword'])) {
-            throw new GraphQlInputException(__('"newPassword" value should be specified'));
+            throw new GraphQlInputException(__('Specify the "newPassword" value.'));
         }
 
         $currentUserId = $context->getUserId();

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

@@ -45,11 +45,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($args['email'])) {
-            throw new GraphQlInputException(__('"email" value should be specified'));
+            throw new GraphQlInputException(__('Specify the "email" value.'));
         }
 
         if (!isset($args['password'])) {
-            throw new GraphQlInputException(__('"password" value should be specified'));
+            throw new GraphQlInputException(__('Specify the "password" value.'));
         }
 
         try {

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

@@ -55,6 +55,6 @@ public function resolve(
 
         $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
-        return $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId);
+        return ['result' => $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId)];
     }
 }

app/code/Magento/CustomerGraphQl/etc/schema.graphqls

@@ -6,10 +6,10 @@ type Query {
 }
 
 type Mutation {
-    generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve Customer token")
-    changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes password for logged in customer")
-    updateCustomer (input: UpdateCustomerInput): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update customer personal information")
-    revokeCustomerToken: Boolean @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke Customer token")
+    generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve the customer token")
+    changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
+    updateCustomer (input: UpdateCustomerInput!): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
+    revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
 }
 
 type CustomerToken {
@@ -28,6 +28,10 @@ type UpdateCustomerOutput {
     customer: Customer!
 }
 
+type RevokeCustomerTokenOutput {
+    result: Boolean!
+}
+
 type Customer @doc(description: "Customer defines the customer name and address and other details") {
     created_at: String @doc(description: "Timestamp indicating when the account was created")
     group_id: Int @doc(description: "The group assigned to the user. Default values are 0 (Not logged in), 1 (General), 2 (Wholesale), and 3 (Retailer)")

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

@@ -238,7 +238,7 @@ public function testUpdateAccountInformationIfCustomerIsLocked()
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @expectedException \Exception
-     * @expectedExceptionMessage For changing "email" you should provide current "password".
+     * @expectedExceptionMessage Provide the current "password" to change "email".
      */
     public function testUpdateEmailIfPasswordIsMissed()
     {

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

@@ -23,7 +23,9 @@ public function testRevokeCustomerTokenValidCredentials()
     {
         $query = <<<QUERY
             mutation {
-                revokeCustomerToken
+                revokeCustomerToken {
+                    result
+                }
             }
 QUERY;
 
@@ -35,7 +37,7 @@ public function testRevokeCustomerTokenValidCredentials()
 
         $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
-        $this->assertTrue($response['revokeCustomerToken']);
+        $this->assertTrue($response['revokeCustomerToken']['result']);
     }
 
     /**
@@ -46,7 +48,9 @@ public function testRevokeCustomerTokenForGuestCustomer()
     {
         $query = <<<QUERY
             mutation {
-                revokeCustomerToken
+                revokeCustomerToken {
+                    result
+                }
             }
 QUERY;
         $this->graphQlQuery($query, [], '');

lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAlreadyExistsException.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * Class GraphQlAlreadyExistsException
+ * Exception for GraphQL to be thrown when data already exists
  */
 class GraphQlAlreadyExistsException extends AlreadyExistsException implements ClientAware
 {

lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthenticationException.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * Class GraphQlAuthenticationException
+ * Exception for GraphQL to be thrown when authentication fails
  */
 class GraphQlAuthenticationException extends AuthenticationException implements ClientAware
 {

lib/internal/Magento/Framework/GraphQl/Exception/GraphQlAuthorizationException.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Exception\AuthorizationException;
 
 /**
- * Class GraphQlAuthorizationException
+ * Exception for GraphQL to be thrown when authorization fails
  */
 class GraphQlAuthorizationException extends AuthorizationException implements \GraphQL\Error\ClientAware
 {
@@ -37,15 +37,15 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0,
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function isClientSafe() : bool
     {
         return $this->isSafe;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getCategory() : string
     {

lib/internal/Magento/Framework/GraphQl/Exception/GraphQlInputException.php

@@ -37,15 +37,15 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0,
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function isClientSafe() : bool
     {
         return $this->isSafe;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getCategory() : string
     {

lib/internal/Magento/Framework/GraphQl/Exception/GraphQlNoSuchEntityException.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * Class GraphQlNoSuchEntityException
+ * Exception for GraphQL to be thrown when entity does not exists
  */
 class GraphQlNoSuchEntityException extends NoSuchEntityException implements \GraphQL\Error\ClientAware
 {
@@ -37,15 +37,15 @@ public function __construct(Phrase $phrase, \Exception $cause = null, $code = 0,
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function isClientSafe() : bool
     {
         return $this->isSafe;
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function getCategory() : string
     {