GraphQL-54: [Mutations] My Account: Change Password

Author: Valeriy Nayda

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

@@ -62,22 +62,24 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $customerId = $this->userContext->getUserId();
+        if (!isset($args['currentPassword'])) {
+            throw new GraphQlInputException(__('"currentPassword" value should be specified'));
+        }
+
+        if (!isset($args['newPassword'])) {
+            throw new GraphQlInputException(__('"newPassword" value should be specified'));
+        }
 
-        if ($customerId === 0 || $customerId === null) {
+        $customerId = (int)$this->userContext->getUserId();
+        if ($customerId === 0) {
             throw new GraphQlAuthorizationException(
                 __(
                     'Current customer does not have access to the resource "%1"',
                     [Customer::ENTITY]
                 )
             );
         }
-        if (!isset($args['currentPassword'])) {
-            throw new GraphQlInputException(__('"currentPassword" value should be specified'));
-        }
-        if (!isset($args['newPassword'])) {
-            throw new GraphQlInputException(__('"newPassword" value should be specified'));
-        }
+
         $this->accountManagement->changePasswordById($customerId, $args['currentPassword'], $args['newPassword']);
         $data = $this->customerResolver->getCustomerById($customerId);