saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-08 02:32:41 +00:00
Code Activity

Merge pull request #401 from TheMardy/master

Browse source 
Images in Email Templates
This commit is contained in:
Daniel García 2019-04-30 17:52:10 +02:00 • committed by GitHub
commit 3160780549
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/api/web.rs
View file

@ -9,11 +9,12 @@ use rocket_contrib::json::Json;
use serde_json::Value;
use crate::util::Cached;
use crate::error::Error;
use crate::CONFIG;
pub fn routes() -> Vec<Route> {
if CONFIG.web_vault_enabled() {
routes![web_index, app_id, web_files, attachments, alive]
routes![web_index, app_id, web_files, attachments, alive, images]
} else {
routes![attachments, alive]
}
@ -62,3 +63,13 @@ fn alive() -> Json<String> {
Json(format_date(&Utc::now().naive_utc()))
}
#[get("/images/<filename>")]
fn images(filename: String) -> Result<Content<Vec<u8>>, Error> {
let image_type = ContentType::new("image", "png");
match filename.as_ref() {
"mail-github.png" => Ok(Content(image_type , include_bytes!("../static/images/mail-github.png").to_vec())),
"logo-gray.png" => Ok(Content(image_type, include_bytes!("../static/images/logo-gray.png").to_vec())),
_ => err!("Image not found")
}
}