Merge remote-tracking branch 'origin/AC-15177' into spartans_pr_03092025

Author: glo60612

app/code/Magento/Customer/Controller/Account/CreatePost.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -226,6 +226,7 @@ public function __construct(
      * Retrieve cookie manager
      *
      * @deprecated 100.1.0
+     * @see https://jira.corp.magento.com/browse/MAGETWO-71174
      * @return \Magento\Framework\Stdlib\Cookie\PhpCookieManager
      */
     private function getCookieManager()
@@ -242,6 +243,7 @@ private function getCookieManager()
      * Retrieve cookie metadata factory
      *
      * @deprecated 100.1.0
+     * @see https://jira.corp.magento.com/browse/MAGETWO-71174
      * @return \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
      */
     private function getCookieMetadataFactory()
@@ -361,6 +363,8 @@ public function execute()
             return $this->resultRedirectFactory->create()
                 ->setUrl($this->_redirect->error($url));
         }
+
+        $this->decodePunycodeEmail();
         $this->session->regenerateId();
         try {
             $address = $this->extractAddress();
@@ -512,4 +516,28 @@ private function getMessageManagerSuccessMessage(): MessageInterface
 
         return $message;
     }
+
+    /**
+     * Convert punycode email back to Unicode
+     *
+     * @return void
+     */
+    private function decodePunycodeEmail(): void
+    {
+        $email = $this->getRequest()->getParam('email');
+        if (!$email || strpos($email, '@') === false) {
+            return;
+        }
+
+        // Split local part and domain
+        [$localPart, $domain] = explode('@', $email, 2);
+
+        // Only decode if domain contains punycode (contains 'xn--')
+        if (function_exists('idn_to_utf8') && strpos($domain, 'xn--') !== false) {
+            $decodedDomain = idn_to_utf8($domain, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
+            if ($decodedDomain !== false && $decodedDomain !== $domain) {
+                $this->getRequest()->setParam('email', $localPart . '@' . $decodedDomain);
+            }
+        }
+    }
 }

app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  *
  * @var $block \Magento\Customer\Block\Account\Forgotpassword
  */
@@ -10,6 +10,7 @@
 
 /** @var \Magento\Customer\Block\Account\Forgotpassword $block */
 if (!$block->getButtonLockManager()) {
+    // phpcs:ignore
     $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
     $block->setButtonLockManager(
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
@@ -27,7 +28,7 @@ if (!$block->getButtonLockManager()) {
         <div class="field email required">
             <label for="email_address" class="label"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $escaper->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $escaper->escapeHtmlAttr($block->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <?= $block->getChildHtml('form_additional_info') ?>

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -1,13 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 // phpcs:disable Generic.Files.LineLength.TooLong
 
 /** @var \Magento\Customer\Block\Form\Login $block */
 if (!$block->getButtonLockManager()) {
+    // phpcs:ignore
     $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
     $block->setButtonLockManager(
         $objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
@@ -35,7 +36,6 @@ if (!$block->getButtonLockManager()) {
                             <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?>
                                id="email" type="email" class="input-text"
                                title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>"
-                               data-mage-init='{"mage/trim-input":{}}'
                                data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>

dev/tests/integration/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php

@@ -173,6 +173,37 @@ public function testNoConfirmCreatePostAction(): void
         $this->assertNull($customer->getData('increment_id'));
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoConfigFixture current_website customer/create_account/confirm 0
+     * @magentoConfigFixture current_store customer/create_account/default_group 1
+     * @magentoConfigFixture current_store customer/create_account/generate_human_friendly_id 0
+     *
+     * @dataProvider emailDataProvider
+     * @param string $email
+     * @param string $expectedEmail
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function testNoConfirmCreatePostPunycodeEmailAction(string $email, string $expectedEmail): void
+    {
+        $this->fillRequestWithAccountData($email);
+        $this->dispatch('customer/account/createPost');
+        $this->assertRedirect($this->stringEndsWith('customer/account/'));
+        $this->assertSessionMessages(
+            $this->containsEqual(
+                (string)__('Thank you for registering with %1.', $this->storeManager->getStore()->getFrontendName())
+            ),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $customer = $this->customerRegistry->retrieveByEmail($expectedEmail);
+        //Assert customer group
+        $this->assertEquals(1, $customer->getDataModel()->getGroupId());
+        //Assert customer email
+        $this->assertEquals($expectedEmail, $customer->getData('email'));
+    }
+
     /**
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
@@ -289,6 +320,25 @@ public function testRegisterCustomerWithEmailConfirmation(): void
         $this->assertEmpty($this->customerRepository->get($email)->getConfirmation());
     }
 
+    /**
+     * Email data provider for testing punycode functionality
+     *
+     * @return array[]
+     */
+    public static function emailDataProvider(): array
+    {
+        return [
+            'encoded' => [
+                'email' => '[email protected]',
+                'expected' => 'test@sómething.com',
+            ],
+            'non-encoded' => [
+                'email' => 'test@sómething.com',
+                'expected' => 'test@sómething.com',
+            ]
+        ];
+    }
+
     /**
      * Fills request with customer data.
      *