MC-39757: Email to reset admin password shows "Your password reset link has expired", when using custom template

Author: rostyslav-hymon

app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

@@ -10,7 +10,7 @@
 "var user.id":"Account Holder Id",
 "var user.rp_token":"Reset Password Token",
 "var user.name":"Account Holder Name",
-"store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL",
+"store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.user_id _query_token=$user.rp_token":"Reset Password URL",
 "var username":"Account Holder Name"
 } @-->
 
@@ -20,7 +20,7 @@
 
 {{trans "If you requested this change, reset your password here:"}}
 
-{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token _nosid=1}}
+{{store url="admin/auth/resetpassword/" _query_id=$user.user_id _query_token=$user.rp_token _nosid=1}}
 
 {{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}
 

dev/tests/integration/testsuite/Magento/Email/Model/_files/email_template_reset_password_user_notification.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$origTemplateCode = 'admin_emails_forgot_email_template';
+/** @var \Magento\Email\Model\Template $template */
+$template = $objectManager->create(\Magento\Email\Model\Template::class);
+$template->loadDefault($origTemplateCode);
+$template->setTemplateCode('Reset Password User Notification Custom Code');
+$template->setOrigTemplateCode('admin_emails_forgot_email_template');
+$template->setId(null);
+$template->save();

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -591,7 +591,9 @@ public function testSendNotificationEmailsIfRequired()
             ->get(MutableScopeConfigInterface::class);
         $config->setValue(
             'admin/emails/new_user_notification_template',
-            $this->getCustomEmailTemplateIdForNewUserNotification()
+            $this->getCustomEmailTemplateIdForNewUserNotification(
+                'admin_emails_new_user_notification_template'
+            )
         );
         $userModel = Bootstrap::getObjectManager()
             ->create(User::class);
@@ -621,15 +623,15 @@ public function testSendNotificationEmailsIfRequired()
     /**
      * Return email template id for new user notification
      *
+     * @param string $origTemplateCode
      * @return int|null
      * @throws NotFoundException
      */
-    private function getCustomEmailTemplateIdForNewUserNotification(): ?int
+    private function getCustomEmailTemplateIdForNewUserNotification(string $origTemplateCode): ?int
     {
         $templateId = null;
         $templateCollection = Bootstrap::getObjectManager()
             ->get(TemplateCollection::class);
-        $origTemplateCode = 'admin_emails_new_user_notification_template';
         foreach ($templateCollection as $template) {
             if ($template->getOrigTemplateCode() == $origTemplateCode) {
                 $templateId = (int) $template->getId();
@@ -643,4 +645,33 @@ private function getCustomEmailTemplateIdForNewUserNotification(): ?int
         }
         return $templateId;
     }
+
+    /**
+     * Verify custom notification is correctly when reset admin password
+     *
+     * @magentoDataFixture Magento/Email/Model/_files/email_template_reset_password_user_notification.php
+     * @magentoDataFixture Magento/User/_files/user_with_role.php
+     */
+    public function testNotificationEmailsIfResetPassword()
+    {
+        /** @var MutableScopeConfigInterface $config */
+        $config = Bootstrap::getObjectManager()
+            ->get(MutableScopeConfigInterface::class);
+        $config->setValue(
+            'admin/emails/forgot_email_template',
+            $this->getCustomEmailTemplateIdForNewUserNotification(
+                'admin_emails_forgot_email_template'
+            )
+        );
+        $userModel = $this->_model->loadByUsername('adminUser');
+        $notificator = $this->objectManager->get(\Magento\User\Model\Spi\NotificatorInterface::class);
+        $notificator->sendForgotPassword($userModel);
+        /** @var TransportBuilderMock $transportBuilderMock */
+        $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
+        $sentMessage = $transportBuilderMock->getSentMessage();
+        $this->assertStringContainsString(
+            'id='.$userModel->getId(),
+            quoted_printable_decode($sentMessage->getBodyText())
+        );
+    }
 }