GraphQL-458: CustomerGraphQl module refactoring

Author: naydav

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

@@ -102,6 +102,7 @@ public function execute(CustomerInterface $customer): array
         }
         $customerData = array_merge($customerData, $customAttributes);
 
+        $customerData['model'] = $customer;
         return $customerData;
     }
 }

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

@@ -11,6 +11,7 @@
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -81,8 +82,12 @@ public function resolve(
         $customerId = (int)$customer->getId();
 
         $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
-        $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
 
+        try {
+            $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__($e->getMessage()), $e);
+        }
         return $this->extractCustomerData->execute($customer);
     }
 }