From bc3adcb610c0ae5b0fa361d6eda86d152e51b673 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 6 Jun 2019 19:03:47 +0200 Subject: [PATCH] actually add fingerprint to manage mail template --- src/mail.rs | 6 ++++-- src/web/manage.rs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mail.rs b/src/mail.rs index 8e8af1a..4f5dbd7 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -22,6 +22,7 @@ mod context { #[derive(Serialize, Clone)] pub struct Manage { + pub primary_fp: String, pub uri: String, pub base_uri: String, pub domain: String, @@ -90,9 +91,10 @@ impl Service { ) } - pub fn send_manage_token(&self, recipient: &Email, link_path: &str) - -> Result<()> { + pub fn send_manage_token(&self, tpk_name: String, recipient: &Email, + link_path: &str) -> Result<()> { let ctx = context::Manage { + primary_fp: tpk_name, uri: format!("{}{}", self.base_uri, link_path), base_uri: self.base_uri.clone(), domain: self.domain.clone(), diff --git a/src/web/manage.rs b/src/web/manage.rs index 6d3b219..932f5bc 100644 --- a/src/web/manage.rs +++ b/src/web/manage.rs @@ -147,10 +147,11 @@ pub fn vks_manage_post( } let fpr: Fingerprint = tpk.fingerprint().try_into().unwrap(); + let fpr_text = fpr.to_string(); let token = token_service.create(&StatelessVerifyToken { fpr }); let link_path = uri!(vks_manage_key: token).to_string(); - if let Err(e) = mail_service.send_manage_token(&email, &link_path) { + if let Err(e) = mail_service.send_manage_token(fpr_text, &email, &link_path) { return MyResponse::ise(e); }