fix: mfa email template

app/config/locale/templates/email-mfa-challenge.tpl

@@ -0,0 +1,16 @@
+<p>{{hello}}</p>
+
+<p>{{description}}</p>
+
+<table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
+    <tr>
+        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
+            <p style="font-size: 24px; text-indent: 18px; letter-spacing: 18px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 24px 12px; border: 1px solid #EDEDF0; display: inline-block; font-weight: bold; ">{{otp}}</p>
+        </td>
+    </tr>
+</table>
+
+<p>{{clientInfo}}</p>
+
+<p style="margin-bottom: 0px;">{{thanks}}</p>
+<p style="margin-top: 0px;">{{signature}}</p>

app/config/locale/translations/en.json

@@ -4,13 +4,13 @@
     "settings.direction": "ltr",
     "emails.sender": "%s Team",
     "emails.verification.subject": "Account Verification",
-    "emails.verification.hello": "Hey {{user}}",
+    "emails.verification.hello": "Hello {{user}}",
     "emails.verification.body": "Follow this link to verify your email address.",
     "emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
     "emails.verification.thanks": "Thanks",
     "emails.verification.signature": "{{project}} team",
     "emails.magicSession.subject": "{{project}} Login",
-    "emails.magicSession.hello": "Hello,",
+    "emails.magicSession.hello": "Hello {{user}}",
     "emails.magicSession.optionButton": "Click the button below to securely sign in to your {{project}} account. This link will expire in 1 hour.",
     "emails.magicSession.buttonText": "Sign in to {{project}}",
     "emails.magicSession.optionUrl": "If you are unable to sign in using the button above, please visit the following link:",
@@ -19,12 +19,18 @@
     "emails.magicSession.thanks": "Thanks,",
     "emails.magicSession.signature": "{{project}} team",
     "emails.otpSession.subject": "OTP for {{project}} Login",
-    "emails.otpSession.hello": "Hello,",
+    "emails.otpSession.hello": "Hello {{user}}",
     "emails.otpSession.description": "Enter the following verification code when prompted to securely sign in to your {{project}} account. This code will expire in 15 minutes.",
     "emails.otpSession.clientInfo": "This sign in was requested using {{agentClient}} on {{agentDevice}} {{agentOs}}. If you didn't request the sign in, you can safely ignore this email.",
     "emails.otpSession.securityPhrase": "Security phrase for this email is {{phrase}}. You can trust this email if this phrase matches the phrase shown during sign in.",
     "emails.otpSession.thanks": "Thanks,",
     "emails.otpSession.signature": "{{project}} team",
+    "emails.mfaChallenge.subject": "Verification Code for {{project}}",
+    "emails.mfaChallenge.hello": "Hello {{user}}",
+    "emails.mfaChallenge.description": "Enter the following verification code to verify your email and activate two-step verification in {{b}}{{project}}{{/b}}. This code will expire in 15 minutes.",
+    "emails.mfaChallenge.clientInfo": "This verification code was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the verification code, you can safely ignore this email.",
+    "emails.mfaChallenge.thanks": "Thanks,",
+    "emails.mfaChallenge.signature": "{{project}} team",
     "emails.recovery.subject": "Password Reset",
     "emails.recovery.hello": "Hello {{user}}",
     "emails.recovery.body": "Follow this link to reset your {{project}} password.",
@@ -32,7 +38,7 @@
     "emails.recovery.thanks": "Thanks",
     "emails.recovery.signature": "{{project}} team",
     "emails.invitation.subject": "Invitation to %s Team at %s",
-    "emails.invitation.hello": "Hello",
+    "emails.invitation.hello": "Hello {{user}}",
     "emails.invitation.body": "This mail was sent to you because {{owner}} wanted to invite you to become a member of the {{team}} team at {{project}}.",
     "emails.invitation.footer": "If you are not interested, you can ignore this message.",
     "emails.invitation.thanks": "Thanks",

app/controllers/api/account.php

@@ -3707,11 +3707,13 @@ App::post('/v1/account/mfa/challenge')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('user')
+    ->inject('locale')
+    ->inject('project')
+    ->inject('request')
     ->inject('queueForEvents')
     ->inject('queueForMessaging')
     ->inject('queueForMails')
-    ->inject('locale')
-    ->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails, Locale $locale) {
+    ->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Locale $locale, Document $project, Request $request, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails) {
 
         $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
         $code = Auth::codeGenerator();
@@ -3764,9 +3766,85 @@ App::post('/v1/account/mfa/challenge')
                     throw new Exception(Exception::USER_EMAIL_NOT_VERIFIED);
                 }
 
+                $subject = $locale->getText("emails.mfaChallenge.subject");
+                $customTemplate = $project->getAttribute('templates', [])['email.mfaChallenge-' . $locale->default] ?? [];
+
+                $detector = new Detector($request->getUserAgent('UNKNOWN'));
+                $agentOs = $detector->getOS();
+                $agentClient = $detector->getClient();
+                $agentDevice = $detector->getDevice();
+
+                $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-mfa-challenge.tpl');
+                $message
+                    ->setParam('{{hello}}', $locale->getText("emails.mfaChallenge.hello"))
+                    ->setParam('{{description}}', $locale->getText("emails.mfaChallenge.description"))
+                    ->setParam('{{clientInfo}}', $locale->getText("emails.mfaChallenge.clientInfo"))
+                    ->setParam('{{thanks}}', $locale->getText("emails.mfaChallenge.thanks"))
+                    ->setParam('{{signature}}', $locale->getText("emails.mfaChallenge.signature"));
+
+                $body = $message->render();
+
+                $smtp = $project->getAttribute('smtp', []);
+                $smtpEnabled = $smtp['enabled'] ?? false;
+
+                $senderEmail = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+                $senderName = App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+                $replyTo = "";
+
+                if ($smtpEnabled) {
+                    if (!empty($smtp['senderEmail'])) {
+                        $senderEmail = $smtp['senderEmail'];
+                    }
+                    if (!empty($smtp['senderName'])) {
+                        $senderName = $smtp['senderName'];
+                    }
+                    if (!empty($smtp['replyTo'])) {
+                        $replyTo = $smtp['replyTo'];
+                    }
+
+                    $queueForMails
+                        ->setSmtpHost($smtp['host'] ?? '')
+                        ->setSmtpPort($smtp['port'] ?? '')
+                        ->setSmtpUsername($smtp['username'] ?? '')
+                        ->setSmtpPassword($smtp['password'] ?? '')
+                        ->setSmtpSecure($smtp['secure'] ?? '');
+
+                    if (!empty($customTemplate)) {
+                        if (!empty($customTemplate['senderEmail'])) {
+                            $senderEmail = $customTemplate['senderEmail'];
+                        }
+                        if (!empty($customTemplate['senderName'])) {
+                            $senderName = $customTemplate['senderName'];
+                        }
+                        if (!empty($customTemplate['replyTo'])) {
+                            $replyTo = $customTemplate['replyTo'];
+                        }
+
+                        $body = $customTemplate['message'] ?? '';
+                        $subject = $customTemplate['subject'] ?? $subject;
+                    }
+
+                    $queueForMails
+                        ->setSmtpReplyTo($replyTo)
+                        ->setSmtpSenderEmail($senderEmail)
+                        ->setSmtpSenderName($senderName);
+                }
+
+                $emailVariables = [
+                    'direction' => $locale->getText('settings.direction'),
+                    /* {{user}}, {{project}} and {{otp}} are required in the templates */
+                    'user' => $user->getAttribute('name'),
+                    'project' => $project->getAttribute('name'),
+                    'otp' => $code,
+                    'agentDevice' => $agentDevice['deviceBrand'] ?? $agentDevice['deviceBrand'] ?? 'UNKNOWN',
+                    'agentClient' => $agentClient['clientName'] ?? 'UNKNOWN',
+                    'agentOs' => $agentOs['osName'] ?? 'UNKNOWN'
+                ];
+
                 $queueForMails
-                    ->setSubject("{$code} is your 6-digit code")
-                    ->setBody($code)
+                    ->setSubject($subject)
+                    ->setBody($body)
+                    ->setVariables($emailVariables)
                     ->setRecipient($user->getAttribute('email'))
                     ->trigger();
                 break;

src/Appwrite/Platform/Workers/Mails.php

@@ -32,6 +32,11 @@ class Mails extends Action
             ->callback(fn (Message $message, Registry $register, Log $log) => $this->action($message, $register, $log));
     }
 
+    protected array $richTextParams = [
+        'b' => '<strong>',
+        '/b' => '</strong>',
+    ];
+
     /**
      * @param Message $message
      * @param Registry $register
@@ -81,6 +86,9 @@ class Mails extends Action
             // TODO: hotfix for redirect param
             $bodyTemplate->setParam('{{' . $key . '}}', $value, escapeHtml: $key !== 'redirect');
         }
+        foreach ($this->richTextParams as $key => $value) {
+            $bodyTemplate->setParam('{{' . $key . '}}', $value, escapeHtml: false);
+        }
         $body = $bodyTemplate->render();
 
         $subjectTemplate = Template::fromString($subject);