magic-link

Author: jozefrebjak

src/Controllers/MagicLinkController.php

@@ -6,6 +6,7 @@
 
 use App\Controllers\BaseController;
 use CodeIgniter\Events\Events;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Authentication\Authenticators\Session;
@@ -90,11 +91,18 @@ public function loginAction()
             'expires' => Time::now()->addSeconds(setting('Auth.magicLinkLifetime'))->format('Y-m-d H:i:s'),
         ]);
 
+        /** @var IncomingRequest $request */
+        $request = service('request');
+
+        $ipAddress = $request->getIPAddress();
+        $userAgent = (string) $request->getUserAgent();
+        $date      = Time::now()->toDateTimeString();
+
         // Send the user an email with the code
         $email = emailer()->setFrom(setting('Email.fromEmail'), setting('Email.fromName') ?? '');
         $email->setTo($user->email);
         $email->setSubject(lang('Auth.magicLinkSubject'));
-        $email->setMessage(view(setting('Auth.views')['magic-link-email'], ['token' => $token]));
+        $email->setMessage(view(setting('Auth.views')['magic-link-email'], ['token' => $token, 'ipAddress' => $ipAddress, 'userAgent' => $userAgent, 'date' => $date]));
 
         if ($email->send(false) === false) {
             log_message('error', $email->printDebugger(['headers']));

src/Language/de/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Tut mir leid. Ihr Reset-Token ist abgelaufen.',
 
     // Email Globals
-    'emailInfo'      => 'Einige Informationen über die Person, die nach dem Code gefragt hat:',
+    'emailInfo'      => 'Einige Informationen über die Person:',
     'emailIpAddress' => 'IP Adresse:',
     'emailDevice'    => 'Gerät:',
     'emailDate'      => 'Datum:',

src/Language/en/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Sorry. Your reset token has expired.',
 
     // Email Globals
-    'emailInfo'      => 'Some information about the person who asked for the code:',
+    'emailInfo'      => 'Some information about the person:',
     'emailIpAddress' => 'IP Address:',
     'emailDevice'    => 'Device:',
     'emailDate'      => 'Date:',

src/Language/es/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Lo sentimos. Tu token de reseteo ha caducado.',
 
     // Email Globals
-    'emailInfo'      => 'Algunos datos sobre la persona que pidió el código:',
+    'emailInfo'      => 'Algunos datos sobre la persona:',
     'emailIpAddress' => 'Dirección IP:',
     'emailDevice'    => 'Dispositivo:',
     'emailDate'      => 'Fecha:',

src/Language/fr/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Désolé. Votre jeton de réinitialisation a expiré.',
 
     // Email Globals
-    'emailInfo'      => 'Quelques informations sur la personne qui a demandé le code:',
+    'emailInfo'      => 'Quelques informations sur la personne:',
     'emailIpAddress' => 'Adresse IP:',
     'emailDevice'    => 'Dispositif:',
     'emailDate'      => 'Jour:',

src/Language/id/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Maaf, token setel ulang Anda sudah habis waktu.',
 
     // Email Globals
-    'emailInfo'      => 'Beberapa informasi tentang seseorang yang meminta kode:',
+    'emailInfo'      => 'Beberapa informasi tentang seseorang:',
     'emailIpAddress' => 'Alamat IP:',
     'emailDevice'    => 'Perangkat:',
     'emailDate'      => 'Tanggal:',

src/Language/ja/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => '申し訳ありません。リセットトークンの有効期限が切れました。', // 'Sorry. Your reset token has expired.',
 
     // Email Globals
-    'emailInfo'      => 'コードを要求した人に関する情報:',
+    'emailInfo'      => '本人に関する情報:',
     'emailIpAddress' => 'IPアドレス:',
     'emailDevice'    => 'デバイス:',
     'emailDate'      => '日時:',

src/Language/sk/Auth.php

@@ -65,7 +65,7 @@
     'resetTokenExpired'         => 'Prepáčte. Platnosť vášho resetovacieho tokenu vypršala.',
 
     // Email Globals
-    'emailInfo'      => 'Niektoré informácie o osobe, ktorá požiadala o kód:',
+    'emailInfo'      => 'Niektoré informácie o osobe:',
     'emailIpAddress' => 'IP Adresa:',
     'emailDevice'    => 'Zariadenie:',
     'emailDate'      => 'Dátum:',

src/Views/Email/email_2fa_email.php

@@ -1,19 +1,31 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title><?= lang('Auth.email2FASubject') ?></title>
 </head>
 
 <body>
     <p><?= lang('Auth.email2FAMailBody') ?></p>
-    <div style="text-align: center"><h1><?= $code ?></h1></div>
+    <div style="text-align: center">
+        <h1><?= $code ?></h1>
+    </div>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+        <tbody>
+            <tr>
+                <td style="line-height: 20px; font-size: 20px; width: 100%; height: 20px; margin: 0;" align="left" width="100%" height="20">
+                    &#160;
+                </td>
+            </tr>
+        </tbody>
+    </table>
     <b><?= lang('Auth.emailInfo') ?></b>
-    <p><?= lang('Auth.emailIpAddress') ?> <?= $ipAddress ?></p>
-    <p><?= lang('Auth.emailDevice') ?> <?= $userAgent ?></p>
-    <p><?= lang('Auth.emailDate') ?> <?= $date ?></p>
+    <p><?= lang('Auth.emailIpAddress') ?> <?= esc($ipAddress) ?></p>
+    <p><?= lang('Auth.emailDevice') ?> <?= esc($userAgent) ?></p>
+    <p><?= lang('Auth.emailDate') ?> <?= esc($date) ?></p>
 </body>
 
 </html>

src/Views/Email/email_activate_email.php

@@ -1,19 +1,31 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="x-apple-disable-message-reformatting">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="format-detection" content="telephone=no, date=no, address=no, email=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <title><?= lang('Auth.emailActivateSubject') ?></title>
 </head>
 
 <body>
     <p><?= lang('Auth.emailActivateMailBody') ?></p>
-    <div style="text-align: center"><h1><?= $code ?></h1></div>
+    <div style="text-align: center">
+        <h1><?= $code ?></h1>
+    </div>
+    <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="width: 100%;" width="100%">
+        <tbody>
+            <tr>
+                <td style="line-height: 20px; font-size: 20px; width: 100%; height: 20px; margin: 0;" align="left" width="100%" height="20">
+                    &#160;
+                </td>
+            </tr>
+        </tbody>
+    </table>
     <b><?= lang('Auth.emailInfo') ?></b>
-    <p><?= lang('Auth.emailIpAddress') ?> <?= $ipAddress ?></p>
-    <p><?= lang('Auth.emailDevice') ?> <?= $userAgent ?></p>
-    <p><?= lang('Auth.emailDate') ?> <?= $date ?></p>
+    <p><?= lang('Auth.emailIpAddress') ?> <?= esc($ipAddress) ?></p>
+    <p><?= lang('Auth.emailDevice') ?> <?= esc($userAgent) ?></p>
+    <p><?= lang('Auth.emailDate') ?> <?= esc($date) ?></p>
 </body>
 
 </html>