Fix welcome page

crates/defguard_common/src/db/models/gateway.rs

@@ -152,6 +152,7 @@ impl Gateway<Id> {
         Ok(record)
     }
 
+    #[must_use]
     pub fn url(&self) -> String {
         format!("http://{}:{}", self.address, self.port)
     }

crates/defguard_core/src/db/models/enrollment.rs

@@ -1,5 +1,6 @@
 use chrono::{NaiveDateTime, TimeDelta, Utc};
 use defguard_common::{
+    VERSION,
     db::{
         Id,
         models::{Settings, settings::defaults::WELCOME_EMAIL_SUBJECT, user::User},
@@ -335,6 +336,7 @@ impl Token {
         context.insert("last_name", &user.last_name);
         context.insert("username", &user.username);
         context.insert("defguard_url", &url);
+        context.insert("defguard_version", &VERSION);
 
         if let Some(admin) = admin {
             context.insert("admin_first_name", &admin.first_name);
@@ -454,14 +456,14 @@ impl Token {
     }
 }
 
-pub fn enrollment_welcome_message(settings: &Settings) -> Result<String, TokenError> {
+fn enrollment_welcome_message(settings: &Settings) -> Result<String, TokenError> {
     settings.enrollment_welcome_message.clone().ok_or_else(|| {
         error!("Enrollment welcome message not configured");
         TokenError::WelcomeMsgNotConfigured
     })
 }
 
-pub fn enrollment_welcome_email(settings: &Settings) -> Result<String, TokenError> {
+fn enrollment_welcome_email(settings: &Settings) -> Result<String, TokenError> {
     if settings.enrollment_use_welcome_message_as_email {
         return enrollment_welcome_message(settings);
     }

crates/defguard_mail/src/tests.rs

@@ -45,13 +45,13 @@ fn send_desktop_start(_: PgPoolOptions, options: PgConnectOptions) {
     let pool = setup_pool(options).await;
     set_smtp_settings(&pool).await;
 
-    let mut transaction = pool.begin().await.unwrap();
+    let mut conn = pool.begin().await.unwrap();
     let context = Context::new();
     let url = Url::parse("http://localhost:8000").unwrap();
     let token = "zXc6N1ndXpWFeyBuogiFp1bD1UomAbZc";
     desktop_start_mail(
         &env::var("SMTP_TO").unwrap(),
-        &mut transaction,
+        &mut conn,
         context,
         &url,
         token,
@@ -69,7 +69,7 @@ fn send_new_device_added(_: PgPoolOptions, options: PgConnectOptions) {
     let pool = setup_pool(options).await;
     set_smtp_settings(&pool).await;
 
-    let mut transaction = pool.begin().await.unwrap();
+    let mut conn = pool.begin().await.unwrap();
     let device_name = "My beloved machine";
     let public_key = "6N8h7HILMcQ6nqEfQMBAYQH26X+y3t/WdWSOW4bNNxw=";
     let locations = &[
@@ -84,7 +84,7 @@ fn send_new_device_added(_: PgPoolOptions, options: PgConnectOptions) {
     ];
     new_device_added_mail(
         &env::var("SMTP_TO").unwrap(),
-        &mut transaction,
+        &mut conn,
         device_name,
         public_key,
         locations,
@@ -104,12 +104,12 @@ fn send_mfa_code(_: PgPoolOptions, options: PgConnectOptions) {
     let pool = setup_pool(options).await;
     set_smtp_settings(&pool).await;
 
-    let mut transaction = pool.begin().await.unwrap();
+    let mut conn = pool.begin().await.unwrap();
     let first_name = "Nebuchadnezzar";
     let code = "123456";
     mfa_code_mail(
         &env::var("SMTP_TO").unwrap(),
-        &mut transaction,
+        &mut conn,
         first_name,
         code,
         None,
@@ -127,13 +127,13 @@ fn send_new_account(_: PgPoolOptions, options: PgConnectOptions) {
     let pool = setup_pool(options).await;
     set_smtp_settings(&pool).await;
 
-    let mut transaction = pool.begin().await.unwrap();
+    let mut conn = pool.begin().await.unwrap();
     let url = Url::parse("http://localhost:8000").unwrap();
     let context = Context::new();
     let token = "zXc6N1ndXpWFeyBuogiFp1bD1UomAbZc";
     new_account_mail(
         &env::var("SMTP_TO").unwrap(),
-        &mut transaction,
+        &mut conn,
         context,
         url,
         token,