Merge remote-tracking branch 'act4/ACP2E-3785' into PR_Apr23_doleksandr

Author: o-dubovyk

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

@@ -1,17 +1,21 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2020 Adobe
  * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
+use Exception;
+use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface as ResolverContext;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
@@ -37,31 +41,40 @@ class UpdateCustomerEmail implements ResolverInterface
      */
     private $extractCustomerData;
 
+    /**
+     * @var EmailNotificationInterface
+     */
+    private $emailNotification;
+
     /**
      * @param GetCustomer $getCustomer
      * @param UpdateCustomerAccount $updateCustomerAccount
      * @param ExtractCustomerData $extractCustomerData
+     * @param EmailNotificationInterface|null $emailNotification
      */
     public function __construct(
         GetCustomer $getCustomer,
         UpdateCustomerAccount $updateCustomerAccount,
-        ExtractCustomerData $extractCustomerData
+        ExtractCustomerData $extractCustomerData,
+        ?EmailNotificationInterface $emailNotification = null
     ) {
         $this->getCustomer = $getCustomer;
         $this->updateCustomerAccount = $updateCustomerAccount;
         $this->extractCustomerData = $extractCustomerData;
+        $this->emailNotification = $emailNotification
+            ?? ObjectManager::getInstance()->get(EmailNotificationInterface::class);
     }
 
     /**
      * Resolve customer email update mutation
      *
-     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
+     * @param Field $field
+     * @param ResolverContext $context
      * @param ResolveInfo $info
      * @param array|null $value
      * @param array|null $args
      * @return array|Value
-     * @throws \Exception
+     * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(
@@ -77,6 +90,7 @@ public function resolve(
         }
 
         $customer = $this->getCustomer->execute($context);
+        $customerOriginalEmail = $customer->getEmail();
         $customer->setData('ignore_validation_flag', true);
         $this->updateCustomerAccount->execute(
             $customer,
@@ -86,7 +100,11 @@ public function resolve(
             ],
             $context->getExtensionAttributes()->getStore()
         );
-
+        $this->emailNotification->credentialsChanged(
+            $customer,
+            $customerOriginalEmail,
+            false
+        );
         return ['customer' => $this->extractCustomerData->execute($customer)];
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerGraphQl/Model/Resolver/CustomerTest.php

@@ -13,6 +13,7 @@
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 use Magento\CustomerGraphQl\Model\Resolver\Customer as CustomerResolver;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\NewsletterGraphQl\Model\Resolver\IsSubscribed;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
@@ -25,6 +26,7 @@
 use Magento\Store\Test\Fixture\Store as StoreFixture;
 use Magento\Store\Test\Fixture\Website as WebsiteFixture;
 use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQl\ResolverCacheAbstract;
 use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
@@ -61,6 +63,11 @@ class CustomerTest extends ResolverCacheAbstract
      */
     private $registry;
 
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -76,6 +83,7 @@ protected function setUp(): void
         $this->websiteRepository = $this->objectManager->get(
             WebsiteRepositoryInterface::class
         );
+        $this->json = $this->objectManager->get(SerializerInterface::class);
 
         // first register secure area so we have permission to delete customer in tests
         $this->registry = $this->objectManager->get(Registry::class);
@@ -830,6 +838,47 @@ private function getCustomerQuery(): string
         QUERY;
     }
 
+    /**
+     * Test that updated customer email is returned in the response
+     *
+     * @throws Exception
+     */
+    #[
+        DbIsolation(false),
+        DataFixture(CustomerFixture::class, ['email' => 'customer@example.com'], as: 'customer'),
+    ]
+    public function testChangeEmailSuccessfully(): void
+    {
+        $currentPassword = 'password';
+        $updatedEmail = 'customer2@example.com';
+        $query
+            = <<<QUERY
+mutation {
+  updateCustomerEmail(
+    email: "$updatedEmail",
+    password: "$currentPassword"
+  ) {
+  customer {
+    email
+    }
+  }
+}
+QUERY;
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customerToken = $this->generateCustomerToken(
+            $customer->getEmail(),
+            'password'
+        );
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            ['Authorization' => 'Bearer ' . $customerToken]
+        );
+
+        $this->assertEquals($updatedEmail, $response['updateCustomerEmail']['customer']['email']);
+    }
+
     /**
      * Generate customer token
      *