backend: add branding to email templates

Author: ffreddow

backend/src/api_docs.rs

@@ -20,7 +20,7 @@
 use std::net::Ipv4Addr;
 
 use actix_web::{middleware::Logger, App, HttpServer};
-pub use backend::*;
+use backend::*;
 use log::LevelFilter;
 use simplelog::{ColorChoice, CombinedLogger, Config, TermLogger, TerminalMode};
 use utoipa::{

backend/src/branding.rs

@@ -0,0 +1,31 @@
+/// Branding configuration for the application
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Brand {
+    Warp,
+    Seb,
+}
+
+impl Brand {
+    /// Parse brand from environment variable or string
+    pub fn from_env() -> Self {
+        std::env::var("BRAND")
+            .ok()
+            .and_then(|s| Self::from_str(&s))
+            .unwrap_or(Brand::Warp)
+    }
+
+    /// Parse brand from string
+    pub fn from_str(s: &str) -> Option<Self> {
+        match s.to_lowercase().as_str() {
+            "seb" => Some(Brand::Seb),
+            "warp" => Some(Brand::Warp),
+            _ => None,
+        }
+    }
+}
+
+impl Default for Brand {
+    fn default() -> Self {
+        Brand::Warp
+    }
+}

backend/src/lib.rs

@@ -42,6 +42,7 @@ use udp_server::{
     management::RemoteConnMeta, packet::ManagementResponseV2, socket::ManagementSocket,
 };
 
+pub mod branding;
 pub mod error;
 pub mod middleware;
 pub mod models;
@@ -90,6 +91,7 @@ pub struct AppState {
     pub frontend_url: String,
     pub sender_email: String,
     pub sender_name: String,
+    pub brand: crate::branding::Brand,
     pub keys_in_use: Mutex<HashSet<uuid::Uuid>>,
 }
 
@@ -302,6 +304,7 @@ pub(crate) mod tests {
             frontend_url: std::env::var("FRONTEND_URL").expect("FRONTEND_URL must be set!"),
             sender_email: String::new(),
             sender_name: String::new(),
+            brand: crate::branding::Brand::default(),
             keys_in_use: Mutex::new(HashSet::new()),
         };
 

backend/src/main.rs

@@ -141,6 +141,7 @@ async fn main() -> std::io::Result<()> {
 
     let sender_email = std::env::var("SENDER_EMAIL").expect("SENDER_EMAIL must be set");
     let sender_name = std::env::var("SENDER_NAME").expect("SENDER_NAME must be set");
+    let brand = backend::branding::Brand::from_env();
 
     let state = web::Data::new(AppState {
         pool: pool.clone(),
@@ -149,6 +150,7 @@ async fn main() -> std::io::Result<()> {
         frontend_url: std::env::var("FRONTEND_URL").expect("FRONTEND_URL must be set!"),
         sender_email,
         sender_name,
+        brand,
         keys_in_use: Mutex::new(HashSet::new()),
     });
 

backend/src/routes/auth/register.rs

@@ -32,24 +32,23 @@ use utoipa::ToSchema;
 use validator::Validate;
 
 use crate::{
-    error::Error,
-    routes::auth::VERIFICATION_EXPIRATION_DAYS,
-    utils::{self, get_connection},
-    AppState,
+    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{self, get_connection}
 };
 
 #[derive(Template)]
 #[template(path = "email_verification_en.html")]
 pub struct VerifyEmailENTemplate<'a> {
     pub name: &'a str,
     pub link: &'a str,
+    pub brand: branding::Brand,
 }
 
 #[derive(Template)]
 #[template(path = "email_verification_de.html")]
 pub struct VerifyEmailDETemplate<'a> {
     pub name: &'a str,
     pub link: &'a str,
+    pub brand: branding::Brand,
 }
 
 #[derive(Debug, Deserialize, Serialize, Validate, Clone, ToSchema)]
@@ -96,6 +95,7 @@ fn send_verification_mail(
             let template = VerifyEmailDETemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(body) => (body, "Email verifizieren"),
@@ -111,6 +111,7 @@ fn send_verification_mail(
             let template = VerifyEmailENTemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(body) => (body, "Verify email"),

backend/src/routes/auth/resend_verification.rs

@@ -6,10 +6,7 @@ use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
 use crate::{
-    error::Error,
-    routes::auth::VERIFICATION_EXPIRATION_DAYS,
-    utils::{get_connection, web_block_unpacked},
-    AppState,
+    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{get_connection, web_block_unpacked}
 };
 
 use db_connector::models::{users::User, verification::Verification};
@@ -19,13 +16,15 @@ use db_connector::models::{users::User, verification::Verification};
 pub struct VerifyEmailENTemplate<'a> {
     pub name: &'a str,
     pub link: &'a str,
+    pub brand: branding::Brand,
 }
 
 #[derive(Template)]
 #[template(path = "email_verification_de.html")]
 pub struct VerifyEmailDETemplate<'a> {
     pub name: &'a str,
     pub link: &'a str,
+    pub brand: branding::Brand,
 }
 
 #[derive(Deserialize, ToSchema, Serialize)]
@@ -48,6 +47,7 @@ fn send_verification_mail(
             let template = VerifyEmailDETemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(body) => (body, "Email verifizieren"),
@@ -61,6 +61,7 @@ fn send_verification_mail(
             let template = VerifyEmailENTemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(body) => (body, "Verify email"),

backend/src/routes/auth/start_recovery.rs

@@ -7,10 +7,7 @@ use utoipa::IntoParams;
 use uuid::Uuid;
 
 use crate::{
-    error::Error,
-    routes::user::{get_user, get_user_id},
-    utils::{self, get_connection, web_block_unpacked},
-    AppState,
+    AppState, branding, error::Error, routes::user::{get_user, get_user_id}, utils::{self, get_connection, web_block_unpacked}
 };
 
 #[derive(Deserialize, IntoParams)]
@@ -23,13 +20,15 @@ struct StartRecoveryQuery {
 struct StartRecoveryDETemplate<'a> {
     name: &'a str,
     link: &'a str,
+    brand: branding::Brand,
 }
 
 #[derive(Template)]
 #[template(path = "start_recovery_en.html")]
 struct StartRecoveryENTemplate<'a> {
     name: &'a str,
     link: &'a str,
+    brand: branding::Brand,
 }
 
 #[allow(unused)]
@@ -50,6 +49,7 @@ fn send_email(
             let template = StartRecoveryDETemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(b) => (b, "Passwort Wiederherstellung"),
@@ -63,6 +63,7 @@ fn send_email(
             let template = StartRecoveryENTemplate {
                 name: &name,
                 link: &link,
+                brand: state.brand,
             };
             match template.render() {
                 Ok(b) => (b, "Password Recovery"),

backend/src/routes/send_chargelog_to_user.rs

@@ -6,11 +6,7 @@ use std::io::Read;
 use utoipa::ToSchema;
 
 use crate::{
-    error::Error,
-    rate_limit::ChargerRateLimiter,
-    routes::{charger::add::password_matches, user::get_user},
-    utils::{get_charger_from_db, parse_uuid, send_email_with_attachment},
-    AppState,
+    AppState, branding, error::Error, rate_limit::ChargerRateLimiter, routes::{charger::add::password_matches, user::get_user}, utils::{get_charger_from_db, parse_uuid, send_email_with_attachment}
 };
 
 #[derive(Serialize, Deserialize, ToSchema)]
@@ -38,6 +34,7 @@ struct ChargelogDETemplate<'a> {
     month: &'a str,
     display_name: &'a str,
     monthly_send: bool,
+    brand: branding::Brand,
 }
 
 #[derive(Template)]
@@ -47,6 +44,7 @@ struct ChargelogENTemplate<'a> {
     month: &'a str,
     display_name: &'a str,
     monthly_send: bool,
+    brand: branding::Brand,
 }
 
 fn render_chargelog_email(
@@ -55,6 +53,7 @@ fn render_chargelog_email(
     display_name: &str,
     lang: &str,
     monthly_send: bool,
+    brand: branding::Brand,
 ) -> actix_web::Result<(String, String)> {
     let (body, subject) = match lang {
         "de" | "de-DE" => {
@@ -63,6 +62,7 @@ fn render_chargelog_email(
                 month,
                 display_name,
                 monthly_send,
+                brand,
             };
             match template.render() {
                 Ok(b) => {
@@ -89,6 +89,7 @@ fn render_chargelog_email(
                 month,
                 display_name,
                 monthly_send,
+                brand,
             };
             match template.render() {
                 Ok(b) => {
@@ -167,6 +168,7 @@ pub async fn send_chargelog(
         &metadata.display_name,
         &lang_str,
         metadata.monthly_send,
+        state.brand,
     )?;
 
     let mut chargelog_file = chargelog.file.reopen().map_err(|err| {

backend/src/routes/user/update_user.rs

@@ -18,10 +18,7 @@
  */
 
 use crate::{
-    error::Error,
-    routes::auth::VERIFICATION_EXPIRATION_DAYS,
-    utils::{get_connection, send_email, web_block_unpacked},
-    AppState,
+    AppState, branding, error::Error, routes::auth::VERIFICATION_EXPIRATION_DAYS, utils::{get_connection, send_email, web_block_unpacked}
 };
 use actix_web::{error::ErrorConflict, put, web, HttpResponse, Responder};
 use askama::Template;
@@ -37,6 +34,7 @@ use validator::Validate;
 struct EmailChangeNotificationEn {
     name: String,
     sender_email: String,
+    brand: branding::Brand,
 }
 
 #[allow(unused)]
@@ -45,6 +43,7 @@ struct EmailChangeNotificationEn {
 struct EmailChangeNotificationDe {
     name: String,
     sender_email: String,
+    brand: branding::Brand,
 }
 
 #[allow(unused)]
@@ -60,6 +59,7 @@ fn send_email_change_notification(
                 let template = EmailChangeNotificationDe {
                     name: name.to_string(),
                     sender_email: state.sender_email.clone(),
+                    brand: state.brand,
                 };
                 match template.render() {
                     Ok(body) => (body, "E-Mail-Adresse geändert"),
@@ -73,6 +73,7 @@ fn send_email_change_notification(
                 let template = EmailChangeNotificationEn {
                     name: name.to_string(),
                     sender_email: state.sender_email.clone(),
+                    brand: state.brand,
                 };
                 match template.render() {
                     Ok(body) => (body, "Email address changed"),
@@ -106,6 +107,7 @@ fn send_verification_mail(
                         "{}/api/auth/verify?id={}",
                         state.frontend_url, verification_id
                     ),
+                    brand: state.brand,
                 };
                 match template.render() {
                     Ok(body) => (body, "E-Mail-Adresse bestätigen"),
@@ -124,6 +126,7 @@ fn send_verification_mail(
                         "{}/api/auth/verify?id={}",
                         state.frontend_url, verification_id
                     ),
+                    brand: state.brand,
                 };
                 match template.render() {
                     Ok(body) => (body, "Verify email address"),