Merge pull request #34 from AzizKHAN030/m244_customer-graphql

added customer_id field and get customers email and passing to the resetPassword method

Author: carinadues

src/Model/Resolver/ResetPassword.php

@@ -13,6 +13,7 @@
 
 namespace ScandiPWA\CustomerGraphQl\Model\Resolver;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -36,12 +37,24 @@ class ResetPassword implements ResolverInterface {
      */
     protected $session;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    protected $customerRepository;
+
+    /**
+     * ResetPassword constructor.
+     *
+     * @param CustomerRepositoryInterface $customerRepository
+     */
     public function __construct(
         Session $customerSession,
+        CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $accountManagement
     ) {
         $this->session = $customerSession;
         $this->accountManagement = $accountManagement;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -57,6 +70,13 @@ public function resolve(
         $resetPasswordToken = $args['token'];
         $password = $args['password'];
         $passwordConfirmation = $args['password_confirmation'];
+        $customerId = $args['customer_id'];
+
+        try {
+            $customerEmail = $this->customerRepository->getById($customerId)->getEmail();
+        } catch (\Exception $exception) {
+            throw new GraphQlInputException(__('No customer found'));
+        }
 
         if ($password !== $passwordConfirmation) {
             return [
@@ -73,13 +93,13 @@ public function resolve(
         }
 
         try {
-            $this->accountManagement->resetPassword(null, $resetPasswordToken, $password);
+            $this->accountManagement->resetPassword($customerEmail, $resetPasswordToken, $password);
             $this->session->unsRpToken();
             return [ 'status' => self::STATUS_PASSWORD_UPDATED ];
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
         } catch (\Exception $exception) {
-            throw new GraphQlInputException(__('Something went wrong while saving the new password.'));
+            throw new GraphQlInputException(__('Your password reset link has expired.'));
         }
     }
 }

src/etc/schema.graphqls

@@ -15,7 +15,7 @@ type Mutation {
     confirmCustomerEmail(key: String!, email: String!, password: String!): CreateCustomerType @resolver(class: "\\ScandiPWA\\CustomerGraphQl\\Model\\Resolver\\ConfirmEmail") @doc(description:"Confirm customer account")
     resendConfirmationEmail(email: String!): CustomerActionConfirmationType @resolver(class: "\\ScandiPWA\\CustomerGraphQl\\Model\\Resolver\\ResendConfirmationEmail") @doc(description:"Resend customer confirmation")
     forgotPassword(email: String!): CustomerActionConfirmationType @resolver(class: "\\ScandiPWA\\CustomerGraphQl\\Model\\Resolver\\ForgotPassword") @doc(description:"Resend customer confirmation")
-    s_resetPassword(password: String!, token: String!, password_confirmation: String!): ResetPasswordType @resolver(class: "\\ScandiPWA\\CustomerGraphQl\\Model\\Resolver\\ResetPassword") @doc(description:"Resend customer confirmation")
+    s_resetPassword(customer_id: String!,password: String!, token: String!, password_confirmation: String!): ResetPasswordType @resolver(class: "\\ScandiPWA\\CustomerGraphQl\\Model\\Resolver\\ResetPassword") @doc(description:"Resend customer confirmation")
 }
 
 type CustomerActionConfirmationType {