chore: Update email templates with user information

codeigniter4 · Jun 7, 2024 · 7aff384 · 7aff384
1 parent b942c47
commit 7aff384
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/Authentication/Actions/Email2FA.php b/src/Authentication/Actions/Email2FA.php
@@ -94,7 +94,7 @@ public function handle(IncomingRequest $request)
         $email->setSubject(lang('Auth.email2FASubject'));
         $email->setMessage($this->view(
             setting('Auth.views')['action_email_2fa_email'],
-            ['code'  => $identity->secret, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
+            ['code'  => $identity->secret, 'user' => $user, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
             ['debug' => false]
         ));
 

diff --git a/src/Authentication/Actions/EmailActivator.php b/src/Authentication/Actions/EmailActivator.php
@@ -71,7 +71,7 @@ public function show(): string
         $email->setSubject(lang('Auth.emailActivateSubject'));
         $email->setMessage($this->view(
             setting('Auth.views')['action_email_activate_email'],
-            ['code'  => $code, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
+            ['code'  => $code, 'user' => $user, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
             ['debug' => false]
         ));
 

diff --git a/src/Controllers/MagicLinkController.php b/src/Controllers/MagicLinkController.php
@@ -127,7 +127,7 @@ public function loginAction()
         $email->setSubject(lang('Auth.magicLinkSubject'));
         $email->setMessage($this->view(
             setting('Auth.views')['magic-link-email'],
-            ['token' => $token, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
+            ['token' => $token, 'user' => $user, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date],
             ['debug' => false]
         ));
 

diff --git a/src/Views/Email/email_2fa_email.php b/src/Views/Email/email_2fa_email.php
@@ -23,9 +23,10 @@
         </tbody>
     </table>
     <b><?= lang('Auth.emailInfo') ?></b>
+    <p><?= lang('Auth.username') ?>: <?= esc($user->username) ?></p>
     <p><?= lang('Auth.emailIpAddress') ?> <?= esc($ipAddress) ?></p>
     <p><?= lang('Auth.emailDevice') ?> <?= esc($userAgent) ?></p>
     <p><?= lang('Auth.emailDate') ?> <?= esc($date) ?></p>
 </body>
 
-</html>
+</html>
diff --git a/src/Views/Email/email_activate_email.php b/src/Views/Email/email_activate_email.php
@@ -23,6 +23,7 @@
         </tbody>
     </table>
     <b><?= lang('Auth.emailInfo') ?></b>
+    <p><?= lang('Auth.username') ?>: <?= esc($user->username) ?></p>
     <p><?= lang('Auth.emailIpAddress') ?> <?= esc($ipAddress) ?></p>
     <p><?= lang('Auth.emailDevice') ?> <?= esc($userAgent) ?></p>
     <p><?= lang('Auth.emailDate') ?> <?= esc($date) ?></p>

diff --git a/src/Views/Email/magic_link_email.php b/src/Views/Email/magic_link_email.php
@@ -28,9 +28,10 @@
         </tbody>
     </table>
     <b><?= lang('Auth.emailInfo') ?></b>
+    <p><?= lang('Auth.username') ?>: <?= esc($user->username) ?></p>
     <p><?= lang('Auth.emailIpAddress') ?> <?= esc($ipAddress) ?></p>
     <p><?= lang('Auth.emailDevice') ?> <?= esc($userAgent) ?></p>
     <p><?= lang('Auth.emailDate') ?> <?= esc($date) ?></p>
 </body>
 
-</html>
+</html>