LYNX-397:Update Email Templates Links to Include Email Parameters

Author: wip44850

app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html

@@ -7,7 +7,7 @@
 <!--@subject {{trans "Please confirm your %store_name account" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var store.frontend_name":"Store Name",
-"var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])":"Account Confirmation URL",
+"var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url,email:$customer.email],_nosid:1])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
 "var customer.name":"Customer Name"
@@ -24,7 +24,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
+                        <a href="{{var this.getUrl($store,'customer/account/confirm/',[_query:[id:$customer.id,key:$customer.confirmation,back_url:$back_url,email:$customer.email],_nosid:1])}}" target="_blank">{{trans "Confirm Your Account"}}</a>
                     </td>
                 </tr>
             </table>

app/code/Magento/Customer/view/frontend/email/password_new.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
-"var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Password Reset URL",
+"var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token,email:$customer.email],_nosid:1])":"Password Reset URL",
 "var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
@@ -23,7 +23,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
+                        <a href="{{var this.getUrl($store,'customer/account/createPassword',[_query:[id:$customer.id,token:$customer.rp_token,email:$customer.email],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
                     </td>
                 </tr>
             </table>

app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

@@ -8,7 +8,7 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var customer.name":"Customer Name",
-"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])":"Reset Password URL"
+"var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token,email:$customer.email],_nosid:1])":"Reset Password URL"
 } @-->
 {{template config_path="design/email/header_template"}}
 
@@ -22,7 +22,7 @@
             <table class="inner-wrapper" border="0" cellspacing="0" cellpadding="0" align="center">
                 <tr>
                     <td align="center">
-                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
+                        <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token,email:$customer.email],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
                     </td>
                 </tr>
             </table>

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

@@ -270,7 +270,12 @@ public function testRegisterCustomerWithEmailConfirmation(): void
             $rawMessage
         );
         $this->assertStringContainsString(
-            sprintf('customer/account/confirm/?id=%s&key=%s', $customer->getId(), $confirmation),
+            sprintf(
+                'customer/account/confirm/?email=%s&id=%s&key=%s',
+                urlencode($customer->getEmail()),
+                $customer->getId(),
+                $confirmation
+            ),
             $rawMessage
         );
         $this->resetRequest();

dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

@@ -624,7 +624,7 @@ public function testResetPasswordWhenEmailChanged(): void
         $customerData = $customerRegistry->retrieveByEmail($email);
         $token = $customerData->getRpToken();
         $customerId = $customerData->getId();
-        $this->assertForgotPasswordEmailContent($token, $customerId);
+        $this->assertForgotPasswordEmailContent($token, $customerId, $email);
 
         /* Set new email */
         /** @var CustomerRepositoryInterface $customerRepository */
@@ -701,13 +701,16 @@ private function dispatchLoginPostAction(string $email, string $password): void
      * Check that 'Forgot password' email contains correct data.
      *
      * @param string $token
+     * @param int $customerId
+     * @param string $email
      * @return void
      */
-    private function assertForgotPasswordEmailContent(string $token, int $customerId): void
+    private function assertForgotPasswordEmailContent(string $token, int $customerId, string $email): void
     {
         $message = $this->transportBuilderMock->getSentMessage();
+        $email = urlencode($email);
         //phpcs:ignore
-        $pattern = "/<a.+customer\/account\/createPassword\/\?id={$customerId}&amp;token={$token}.+Set\s+a\s+New\s+Password<\/a\>/";
+        $pattern = "/<a.+customer\/account\/createPassword\/\?email={$email}&amp;id={$customerId}&amp;token={$token}.+Set\s+a\s+New\s+Password<\/a\>/";
         $rawMessage = $message->getBody()->getParts()[0]->getRawContent();
         $messageConstraint = $this->logicalAnd(
             new StringContains('There was recently a request to change the password for your account.'),

dev/tests/integration/testsuite/Magento/Customer/Controller/ForgotPasswordPostTest.php

@@ -491,7 +491,8 @@ private function clickForgotPasswordAndAssertResetLinkReceivedInMail($email): vo
             1,
             Xpath::getElementsCountForXpath(
                 sprintf(
-                    '//a[contains(@href, \'customer/account/createPassword/?id=%1$d&token=%2$s\')]',
+                    '//a[contains(@href, \'customer/account/createPassword/?email=%1$s&id=%2$d&token=%3$s\')]',
+                    urlencode($customerData->getEmail()),
                     $customerId,
                     $token
                 ),

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagement/ResetPasswordTest.php

@@ -73,7 +73,8 @@ public function testSendEmailWithSetNewPasswordLink(): void
             1,
             Xpath::getElementsCountForXpath(
                 sprintf(
-                    '//a[contains(@href, \'customer/account/createPassword/?id=%1$d&token=%2$s\')]',
+                    '//a[contains(@href, \'customer/account/createPassword/?email=%1$s&id=%2$d&token=%3$s\')]',
+                    urlencode($customerSecure->getEmail()),
                     $customerSecure->getId(),
                     $customerSecure->getRpToken()
                 ),