MC-41497: [Contact us] Invalid header value detected error when French characters such as "é", "è" on the email address

Author: victor-v-rad

lib/internal/Magento/Framework/Mail/AddressConverter.php

@@ -40,6 +40,7 @@ public function __construct(
      */
     public function convert(string $email, ?string $name = null): Address
     {
+        $email = $this->convertEmailUserToAscii($email);
         return $this->addressFactory->create(
             [
                 'name' => $name,
@@ -48,6 +49,26 @@ public function convert(string $email, ?string $name = null): Address
         );
     }
 
+    /**
+     * Convert email user to ascii
+     *
+     * @param string $email
+     * @return string
+     */
+    private function convertEmailUserToAscii(string $email): string
+    {
+        if (preg_match('/^(.+)@([^@]+)$/', $email, $matches)) {
+            $user = $matches[1];
+            $hostname = $matches[2];
+            $userEncoded = idn_to_ascii($user);
+            if ($userEncoded == $user) {
+                return $email;
+            }
+            $email = sprintf('%s@%s', $userEncoded, $hostname);
+        }
+        return $email;
+    }
+
     /**
      * Converts array to list of MailAddresses
      *

lib/internal/Magento/Framework/Mail/Test/Unit/AddressConverterTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Mail\Test\Unit;
+
+use Magento\Framework\Mail\AddressConverter;
+use Magento\Framework\Mail\AddressFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\ObjectManager\Config\Config;
+use Magento\Framework\ObjectManager\Factory\Dynamic\Developer;
+use Magento\Framework\ObjectManager\Relations\Runtime;
+use PHPUnit\Framework\TestCase;
+
+class AddressConverterTest extends TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $config = new Config(
+            new Runtime()
+        );
+        $factory = new Developer(
+            $config
+        );
+        $this->objectManager = new ObjectManager($factory, $config);
+    }
+
+    /**
+     * @param string $email
+     * @param string $name
+     * @param string $emailExpected
+     * @param string $nameExpected
+     * @dataProvider convertDataProvider
+     */
+    public function testConvert(string $email, string $name, string $emailExpected, string $nameExpected)
+    {
+        $addressFactory = new AddressFactory($this->objectManager);
+        $addressConverter = new AddressConverter($addressFactory);
+        $address = $addressConverter->convert($email, $name);
+        $this->assertSame($emailExpected, $address->getEmail());
+        $this->assertSame($nameExpected, $address->getName());
+    }
+
+    /**
+     * @return array
+     */
+    public function convertDataProvider(): array
+    {
+        return [
+            [
+                'email' => '[email protected]',
+                'name' => 'Test',
+                'emailExpected' => '[email protected]',
+                'nameExpected' => 'Test'
+            ],
+            [
+                'email' => 'té[email protected]',
+                'name' => 'Test',
+                'emailExpected' => '[email protected]',
+                'nameExpected' => 'Test'
+            ]
+        ];
+    }
+}