diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index b152509226ddb7602511f4c53240ccddb7008e95..00878d88c5e05e042b20cb1ad92c959cc46b0c4c 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -5,9 +5,11 @@
*/
namespace Magento\User\Model;
+use Magento\Backend\App\Area\FrontNameResolver;
use Magento\Backend\Model\Auth\Credential\StorageInterface;
use Magento\Framework\Model\AbstractModel;
use Magento\Framework\Exception\AuthenticationException;
+use Magento\Store\Model\Store;
use Magento\User\Api\Data\UserInterface;
/**
@@ -365,20 +367,13 @@ class User extends AbstractModel implements StorageInterface, UserInterface
*/
public function sendPasswordResetConfirmationEmail()
{
- // Set all required params and send emails
- /** @var \Magento\Framework\Mail\TransportInterface $transport */
- $transport = $this->_transportBuilder->setTemplateIdentifier(
- $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE)
- )->setTemplateOptions(
- ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
- )->setTemplateVars(
- ['user' => $this, 'store' => $this->_storeManager->getStore(0)]
- )->setFrom(
- $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
- )->addTo(
- $this->getEmail(),
- $this->getName()
- )->getTransport();
+ $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
+ $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+ ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
+ ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
+ ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
+ ->addTo($this->getEmail(), $this->getName())
+ ->getTransport();
$transport->sendMessage();
return $this;
@@ -391,20 +386,13 @@ class User extends AbstractModel implements StorageInterface, UserInterface
*/
public function sendPasswordResetNotificationEmail()
{
- // Set all required params and send emails
- /** @var \Magento\Framework\Mail\TransportInterface $transport */
- $transport = $this->_transportBuilder->setTemplateIdentifier(
- $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE)
- )->setTemplateOptions(
- ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
- )->setTemplateVars(
- ['user' => $this, 'store' => $this->_storeManager->getStore(0)]
- )->setFrom(
- $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
- )->addTo(
- $this->getEmail(),
- $this->getName()
- )->getTransport();
+ $templateId = $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE);
+ $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
+ ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
+ ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
+ ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
+ ->addTo($this->getEmail(), $this->getName())
+ ->getTransport();
$transport->sendMessage();
return $this;
diff --git a/app/code/Magento/User/view/adminhtml/email/password_reset.html b/app/code/Magento/User/view/adminhtml/email/password_reset.html
index e0dbd0ba7388815189bb329e2d0e0d1e5cdcf1b9..97e040a8fb3d263485c4b8e7b102043e15d59bf2 100644
--- a/app/code/Magento/User/view/adminhtml/email/password_reset.html
+++ b/app/code/Magento/User/view/adminhtml/email/password_reset.html
@@ -16,3 +16,5 @@
{{trans "If you did not request this change, please contact us."}}
+{{trans "Thank you,"}}
+{{var store.getFrontendName()}}
diff --git a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
index f75307ad8c5ebb28dc03fafc0c075b7ef5a4edf9..f4baffcbd7e10c77c1e3642ebd5e0a9849b97d33 100644
--- a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
+++ b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
@@ -19,3 +19,6 @@
{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}
{{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}
+
+{{trans "Thank you,"}}
+{{var store.getFrontendName()}}
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 5cfae3507d6f443c117bb0a9bd4eb5170d249f69..cb647d4bd9666bae213f803742b5f38c7442ba73 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -6,10 +6,14 @@
* See COPYING.txt for license details.
*/
-// @codingStandardsIgnoreFile
-
namespace Magento\Framework\Mail\Template;
+use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\Mail\Message;
+use Magento\Framework\Mail\MessageInterface;
+use Magento\Framework\Mail\TransportInterfaceFactory;
+use Magento\Framework\ObjectManagerInterface;
+
class TransportBuilder
{
/**
@@ -75,17 +79,17 @@ class TransportBuilder
/**
* @param FactoryInterface $templateFactory
- * @param \Magento\Framework\Mail\Message $message
- * @param \Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver
- * @param \Magento\Framework\ObjectManagerInterface $objectManager
- * @param \Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
+ * @param Message $message
+ * @param SenderResolverInterface $senderResolver
+ * @param ObjectManagerInterface $objectManager
+ * @param TransportInterfaceFactory $mailTransportFactory
*/
public function __construct(
- \Magento\Framework\Mail\Template\FactoryInterface $templateFactory,
- \Magento\Framework\Mail\Message $message,
- \Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver,
- \Magento\Framework\ObjectManagerInterface $objectManager,
- \Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
+ FactoryInterface $templateFactory,
+ Message $message,
+ SenderResolverInterface $senderResolver,
+ ObjectManagerInterface $objectManager,
+ TransportInterfaceFactory $mailTransportFactory
) {
$this->templateFactory = $templateFactory;
$this->message = $message;
@@ -229,13 +233,9 @@ class TransportBuilder
*/
protected function getTemplate()
{
- return $this->templateFactory->get(
- $this->templateIdentifier
- )->setVars(
- $this->templateVars
- )->setOptions(
- $this->templateOptions
- );
+ return $this->templateFactory->get($this->templateIdentifier)
+ ->setVars($this->templateVars)
+ ->setOptions($this->templateOptions);
}
/**
@@ -247,18 +247,14 @@ class TransportBuilder
{
$template = $this->getTemplate();
$types = [
- \Magento\Framework\App\TemplateTypesInterface::TYPE_TEXT => \Magento\Framework\Mail\MessageInterface::TYPE_TEXT,
- \Magento\Framework\App\TemplateTypesInterface::TYPE_HTML => \Magento\Framework\Mail\MessageInterface::TYPE_HTML,
+ TemplateTypesInterface::TYPE_TEXT => MessageInterface::TYPE_TEXT,
+ TemplateTypesInterface::TYPE_HTML => MessageInterface::TYPE_HTML,
];
$body = $template->processTemplate();
- $this->message->setMessageType(
- $types[$template->getType()]
- )->setBody(
- $body
- )->setSubject(
- $template->getSubject()
- );
+ $this->message->setMessageType($types[$template->getType()])
+ ->setBody($body)
+ ->setSubject($template->getSubject());
return $this;
}