add missing name in MFA activated email

Author: wojcik91

crates/defguard_core/src/handlers/auth.rs

@@ -496,6 +496,7 @@ pub async fn webauthn_finish(
             &mut conn,
             Some(&session.session.into()),
             &MFAMethod::Webauthn,
+            &user.first_name,
         )
         .await?;
         user.set_mfa_method(&mut *conn, MFAMethod::Webauthn).await?;
@@ -658,6 +659,7 @@ pub async fn totp_enable(
                 &mut conn,
                 Some(&session.session.into()),
                 &MFAMethod::OneTimePassword,
+                &user.first_name,
             )
             .await?;
             user.set_mfa_method(&mut *conn, MFAMethod::OneTimePassword)
@@ -838,6 +840,7 @@ pub async fn email_mfa_enable(
                 &mut conn,
                 Some(&session.session.into()),
                 &MFAMethod::Email,
+                &user.first_name,
             )
             .await?;
             user.set_mfa_method(&mut *conn, MFAMethod::Email).await?;

crates/defguard_mail/src/templates.rs

@@ -393,9 +393,11 @@ pub async fn mfa_configured_mail(
     conn: &mut PgConnection,
     session: Option<&SessionContext>,
     method: &MFAMethod,
+    first_name: &str,
 ) -> Result<(), TemplateError> {
     let (mut tera, mut context) = get_base_tera_mjml(Context::new(), session, None, None)?;
 
+    context.insert("username", first_name);
     context.insert("mfa_method", &method);
 
     let message = MailMessage::MFAConfigured { method: *method };

crates/defguard_mail/src/tests.rs

@@ -258,6 +258,7 @@ fn send_mfa_configured_mail(_: PgPoolOptions, options: PgConnectOptions) {
         &mut conn,
         None,
         &MFAMethod::Email,
+        "Test",
     )
     .await
     .unwrap();

crates/defguard_mail/templates/mfa-configured.text

@@ -1,4 +1,4 @@
-{{ title }}
+{{ title }}{% if username %} {{ username }}{% endif %}
 {% if subtitle %}{{ subtitle }}{% endif %}
 
 {{ mfa_method_label }} {{ mfa_method }}

crates/defguard_proxy_manager/src/servers/enrollment.rs

@@ -1074,7 +1074,10 @@ impl EnrollmentServer {
             .map_err(|_| Status::internal("Failed to get recovery codes.".to_string()))?
             .ok_or_else(|| Status::internal("Recovery codes not found".to_string()))?;
         if let Ok(mut conn) = self.pool.begin().await {
-            if let Err(err) = mfa_configured_mail(&user.email, &mut conn, None, &mfa_method).await {
+            if let Err(err) =
+                mfa_configured_mail(&user.email, &mut conn, None, &mfa_method, &user.first_name)
+                    .await
+            {
                 error!("Failed to send MFA configured email\nReason: {err}");
             }
         } else {