From c162a46e6234a02ebcd589b21fec2de546090ce4 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Mon, 3 Oct 2016 01:59:24 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D0=B3=D1=80=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=BD=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=B8=D1=81=D1=8C=D0=BC?=
 =?UTF-8?q?=D0=B0=20"=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D0=BF=D0=B0=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authentication/ForgotPasswordForm.php     | 21 ++++++++++++-------
 composer.json                                 |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/api/models/authentication/ForgotPasswordForm.php b/api/models/authentication/ForgotPasswordForm.php
index 61dfe5e..e69adf1 100644
--- a/api/models/authentication/ForgotPasswordForm.php
+++ b/api/models/authentication/ForgotPasswordForm.php
@@ -84,15 +84,20 @@ class ForgotPasswordForm extends ApiForm {
             throw new InvalidConfigException('Please specify fromEmail app in app params');
         }
 
-        $acceptor = $emailActivation->account;
+        $account = $emailActivation->account;
+        $htmlBody = Yii::$app->emailRenderer->getTemplate('forgotPassword')
+            ->setLocale($account->lang)
+            ->setParams([
+                'username' => $account->username,
+                'key' => $emailActivation->key,
+                'link' => Yii::$app->request->getHostInfo() . '/recover-password/' . $emailActivation->key,
+            ])
+            ->render();
+
         /** @var \yii\swiftmailer\Message $message */
-        $message = $mailer->compose([
-            'html' => '@app/mails/forgot-password-html',
-            'text' => '@app/mails/forgot-password-text',
-        ], [
-            'key' => $emailActivation->key,
-        ])
-            ->setTo([$acceptor->email => $acceptor->username])
+        $message = $mailer->compose()
+            ->setHtmlBody($htmlBody)
+            ->setTo([$account->email => $account->username])
             ->setFrom([$fromEmail => 'Ely.by Accounts'])
             ->setSubject('Ely.by Account forgot password');
 
diff --git a/composer.json b/composer.json
index 1d7c064..71c60db 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "ely/yii2-tempmail-validator": "~1.0.0",
         "emarref/jwt": "~1.0.3",
         "ely/amqp-controller": "^0.1.0",
-        "ely/email-renderer": "dev-master#8c975737c6681af4bbd161ff27fe6326d39ba9d6"
+        "ely/email-renderer": "dev-master#c70ab0d3b0208bb7d61281a166ec7a9c5344eaad"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",