rzerres/advotracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

service:send_ticketdata: adapt alingnment of http mail and relay

Browse Source 
* cleanup comments
* correct relay / credential handling

Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
Ralf Zerres
2021-03-08 11:54:28 +01:00
parent a8f6ac6a37
commit c555ce4d85
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/advotracker_client/src/services/exports/send_ticketdata.rs
View File

@@ -33,7 +33,7 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box<dyn Error>> {
"h2, h4 { font-family: Arial, Helvetica, sans-serif; }" "h2, h4 { font-family: Arial, Helvetica, sans-serif; }"
} }
} }
div style="display: flex; flex-direction: column; align-items: center;" { div style="display: flex; flex-direction: column; align-items: left;" {
// compose with variables and strings // compose with variables and strings
h2 { (email.subject) " (" (email.policy_code) ")" } h2 { (email.subject) " (" (email.policy_code) ")" }
p { "Vers.-Schein/Schadennummer: " (email.policy_code) } p { "Vers.-Schein/Schadennummer: " (email.policy_code) }
@@ -58,14 +58,12 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box<dyn Error>> {
info!("email body: {:?}", ascii_body); info!("email body: {:?}", ascii_body);
let message = Message::builder() let message = Message::builder()
//.reply_to("Kanzlei Hiedemann <info@hiedemann.de>".parse().unwrap()) .from((email.mail_from).parse().unwrap())
//.to("Kanzlei Hiedemann <info@hiedemann.de>".parse().unwrap()) .reply_to((email.mail_reply).parse().unwrap())
//.cc("Ralf Zerres <ralf.zerres@networkx.de>".parse().unwrap())
//.reply_to((email.mail_reply).parse().unwrap())
.to((email.mail_to).parse().unwrap()) .to((email.mail_to).parse().unwrap())
.cc((email.mail_cc).parse().unwrap()) .cc((email.mail_cc).parse().unwrap())
// we do not use bcc yet
//.bcc((email.mail_bcc).parse().unwrap()) //.bcc((email.mail_bcc).parse().unwrap())
.from((email.mail_from).parse().unwrap())
.subject(String::new() .subject(String::new()
+ &email.subject.to_string() + &email.subject.to_string()
+ &" (".to_string() + &" (".to_string()
@@ -96,17 +94,17 @@ pub fn sendticketdata(email: &Email, lang: &str) -> Result<(), Box<dyn Error>> {
// Create credential for remote authentication (username, password) // Create credential for remote authentication (username, password)
// WIP: get credentials from config file / cli // WIP: get credentials from config file / cli
//let credentials = Credentials::new("ralf.zerres.de@gmail.com".to_string(), "20jacara03".to_string()); let credentials = Credentials::new("service@hiedemann.de".to_string(), "88service99$".to_string());
let credentials = Credentials::new("info@kanzlei.hiedemann.de".to_string(), "17info67$".to_string());
// standard smtp client connection // standard smtp client connection
//let mailer = SmtpTransport::starttls_relay("hiedemannsbs.kanzlei.hiedemann.de") //let mailer = SmtpTransport::starttls_relay("hiedemannsbs.kanzlei.hiedemann.de")
// Open a remote connection to relay server (port 2525) // Open a remote connection to relay server (port 2525)
// WIP: get relay address from config file / cli // WIP: get relay address from config file / cli
//let mailer = SmtpTransport::relay("hiedemannsbs.kanzlei.hiedemann.de") //let relay = "hiedemannsbs.kanzlei.hiedemann.de"
//let mailer = SmtpTransport::relay("smtp.google.de") let relay = "smtp.strato.de";
let mailer = SmtpTransport::relay("smtp.strato.de")
let mailer = SmtpTransport::relay(relay)
.unwrap() .unwrap()
.credentials(credentials) .credentials(credentials)
.build(); .build();