From a8f6ac6a370f70a859ad0fb119099009c61b7525 Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Mon, 8 Mar 2021 09:50:17 +0100 Subject: [PATCH] services:send_ticketdata: correct relay authentication issues * correct mail_from identifier * correct mail_reply identifier * correct mail_cc identifier Signed-off-by: Ralf Zerres --- crates/advotracker_client/Cargo.toml | 3 ++- .../advotracker_client/src/data/constants.rs | 8 ++++---- .../src/services/exports/send_ticketdata.rs | 20 ++++++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/crates/advotracker_client/Cargo.toml b/crates/advotracker_client/Cargo.toml index 55b7d61..a048158 100644 --- a/crates/advotracker_client/Cargo.toml +++ b/crates/advotracker_client/Cargo.toml @@ -24,7 +24,8 @@ clap = { version = "~2.33", features = ["suggestions", "color"] } csv = { version = "~1.1" } dotenv = { version = "~0.15.0" } envy = { version = "~0.4" } -lettre = "0.10.0-beta.1" +#lettre ={ version = "0.10.0-beta.1", features = ["smtp-transport", "native-tls", "hostname", "r2d2", "builder"] } +lettre ={ version = "0.10.0-beta.1" } lazy_static = { version = "~1.4.0" } log = { version = "~0.4.8" } locales = { version = "~0.1" } diff --git a/crates/advotracker_client/src/data/constants.rs b/crates/advotracker_client/src/data/constants.rs index 690515b..2d9fdf1 100644 --- a/crates/advotracker_client/src/data/constants.rs +++ b/crates/advotracker_client/src/data/constants.rs @@ -8,12 +8,12 @@ // Component Values (Properties) pub static PROP_ADVOTRACKER: &str = "advotracker"; -pub static PROP_MAIL_CC_1: &str = "info@hiedemann.de"; -pub static PROP_MAIL_CC_2: &str = "service@hiedemann.de"; +pub static PROP_MAIL_CC_1: &str = "service@hiedemann.de"; +pub static PROP_MAIL_CC_2: &str = "info@hiedemann.de"; pub static PROP_MAIL_BCC_1: &str = "Networkx Support "; pub static PROP_MAIL_BCC_2: &str = "knoche@hiedemann.de"; -pub static PROP_MAIL_FROM: &str = "Kanzlei Hiedemann "; -pub static PROP_MAIL_REPLY: &str = "Kanzlei Hiedemann "; +pub static PROP_MAIL_FROM: &str = "Kanzlei Hiedemann "; +pub static PROP_MAIL_REPLY: &str = "Kanzlei Hiedemann "; pub static PROP_MAIL_SUBJECT: &str = "ZMB Allianz - neues Mandat"; pub static PROP_MAIL_TO_1: &str = "allianz@ponschab-partner.com"; pub static PROP_MAIL_TO_2: &str = "kontakt@chevalier.law"; diff --git a/crates/advotracker_client/src/services/exports/send_ticketdata.rs b/crates/advotracker_client/src/services/exports/send_ticketdata.rs index 59b99dc..88d51df 100644 --- a/crates/advotracker_client/src/services/exports/send_ticketdata.rs +++ b/crates/advotracker_client/src/services/exports/send_ticketdata.rs @@ -38,11 +38,11 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box> { h2 { (email.subject) " (" (email.policy_code) ")" } p { "Vers.-Schein/Schadennummer: " (email.policy_code) } p { "Versicherungsnehmer: " (email.policy_holder) } - p { "Selbstbehalt: "(email.deductible) } + p { "Selbstbehalt: " (email.deductible) } p { "Rückrufnummer: " (email.callback_number) } p { "Erreichbarkeit: " (email.callback_date) } - p { "Rechtsproblem: "(email.harm_type) } - p { "Rechtsrat: "(email.ivr_comment) } + p { "Rechtsproblem: " (email.harm_type) } + p { "Rechtsrat: " (email.ivr_comment) } } }; @@ -60,7 +60,7 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box> { let message = Message::builder() //.reply_to("Kanzlei Hiedemann ".parse().unwrap()) //.to("Kanzlei Hiedemann ".parse().unwrap()) - //.cc(" ".parse().unwrap()) + //.cc("Ralf Zerres ".parse().unwrap()) //.reply_to((email.mail_reply).parse().unwrap()) .to((email.mail_to).parse().unwrap()) .cc((email.mail_cc).parse().unwrap()) @@ -96,13 +96,19 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box> { // Create credential for remote authentication (username, password) // WIP: get credentials from config file / cli - let creds = Credentials::new("info@kanzlei.hiedemann.de".to_string(), "17info67$".to_string()); + //let credentials = Credentials::new("ralf.zerres.de@gmail.com".to_string(), "20jacara03".to_string()); + let credentials = Credentials::new("info@kanzlei.hiedemann.de".to_string(), "17info67$".to_string()); + + // standard smtp client connection + //let mailer = SmtpTransport::starttls_relay("hiedemannsbs.kanzlei.hiedemann.de") // Open a remote connection to relay server (port 2525) // WIP: get relay address from config file / cli - let mailer = SmtpTransport::relay("hiedemannsbs.kanzlei.hiedemann.de") + //let mailer = SmtpTransport::relay("hiedemannsbs.kanzlei.hiedemann.de") + //let mailer = SmtpTransport::relay("smtp.google.de") + let mailer = SmtpTransport::relay("smtp.strato.de") .unwrap() - .credentials(creds) + .credentials(credentials) .build(); // Send the email