Merge branch 'MC-41497' of https://github.com/magento-l3/magento2ce into PR-20210423

Author: chittima

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, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
+            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,76 @@
+<?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\Mail\Address;
+use PHPUnit\Framework\TestCase;
+
+class AddressConverterTest extends TestCase
+{
+    /**
+     * @var Address
+     */
+    private $addressMock;
+
+    /**
+     * @var AddressFactory
+     */
+    private $addressFactoryMock;
+
+    /**
+     * @var AddressConverter
+     */
+    private $addressConverter;
+
+    protected function setUp(): void
+    {
+        $this->addressMock = $this->createMock(Address::class);
+        $this->addressFactoryMock = $this->createMock(AddressFactory::class);
+        $this->addressConverter = new AddressConverter($this->addressFactoryMock);
+    }
+
+    /**
+     * @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)
+    {
+        $this->addressFactoryMock->expects($this->once())
+            ->method('create')
+            ->with(['name' => $nameExpected, 'email' => $emailExpected])
+            ->willReturn($this->addressMock);
+        $address = $this->addressConverter->convert($email, $name);
+        $this->assertInstanceOf(Address::class, $address);
+    }
+
+    /**
+     * @return array
+     */
+    public function convertDataProvider(): array
+    {
+        return [
+            [
+                'email' => 'test@example.com',
+                'name' => 'Test',
+                'emailExpected' => 'test@example.com',
+                'nameExpected' => 'Test'
+            ],
+            [
+                'email' => 'tést@example.com',
+                'name' => 'Test',
+                'emailExpected' => 'xn--tst-bma@example.com',
+                'nameExpected' => 'Test'
+            ]
+        ];
+    }
+}