From 24eeb54a6b7159964e8887ade7fa5173b50feb3a Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 26 Jan 2025 17:58:57 +0100 Subject: Replace tera by minijinja tera was doing the job all right, but minijinja has fewer dependencies. --- src/controller/login.rs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/controller/login.rs') diff --git a/src/controller/login.rs b/src/controller/login.rs index a1bf466..31370cc 100644 --- a/src/controller/login.rs +++ b/src/controller/login.rs @@ -5,7 +5,6 @@ use hyper::header::SET_COOKIE; use hyper::Response; use sqlx::sqlite::SqlitePool; use std::collections::HashMap; -use tera::{Context, Tera}; use crate::controller::utils::with_headers; use crate::controller::wallet::Wallet; @@ -18,14 +17,15 @@ use crate::validation; pub async fn page( assets: &HashMap, - templates: &Tera, + templates: &minijinja::Environment<'_>, error: Option<&str>, ) -> Response> { let connected_user: Option = None; - let mut context = Context::new(); - context.insert("connected_user", &connected_user); - context.insert("error", &error); + let context = minijinja::context!( + connected_user => &connected_user, + error => &error + ); utils::template(assets, templates, "login.html", context) } @@ -33,7 +33,7 @@ pub async fn page( pub async fn login( config: &Config, assets: &HashMap, - templates: &Tera, + templates: &minijinja::Environment<'_>, form: HashMap, pool: SqlitePool, ) -> Response> { @@ -75,7 +75,10 @@ pub async fn login( } Ok(false) => not_authorized(assets, templates).await, Err(err) => { - log::error!("Error verifying bcrypt password: {:?}", err); + log::error!( + "Error verifying bcrypt password: {:?}", + err + ); server_error(assets, templates, "Erreur serveur").await } }, @@ -88,7 +91,7 @@ pub async fn login( async fn server_error( assets: &HashMap, - templates: &Tera, + templates: &minijinja::Environment<'_>, msg: &str, ) -> Response> { page(assets, templates, Some(msg)).await @@ -96,7 +99,7 @@ async fn server_error( async fn not_authorized( assets: &HashMap, - templates: &Tera, + templates: &minijinja::Environment<'_>, ) -> Response> { page( assets, -- cgit v1.2.3