diff options
Diffstat (limited to 'src/routes.rs')
-rw-r--r-- | src/routes.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/routes.rs b/src/routes.rs index 5f17ca5..aca4284 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -2,9 +2,9 @@ use http_body_util::{BodyExt, Full}; use hyper::body::{Bytes, Incoming}; use hyper::{Method, Request, Response}; use serde::Deserialize; -use sqlx::sqlite::SqlitePool; use std::collections::HashMap; use std::convert::Infallible; +use tokio_rusqlite::Connection; use url::form_urlencoded; use crate::controller; @@ -17,7 +17,7 @@ use crate::utils::cookie; pub async fn routes( config: Config, - pool: SqlitePool, + db_conn: Connection, assets: HashMap<String, String>, templates: minijinja::Environment<'static>, request: Request<Incoming>, @@ -38,7 +38,7 @@ pub async fn routes( &assets, &templates, body_form(request).await, - pool, + db_conn, ) .await } @@ -49,10 +49,10 @@ pub async fn routes( "icon.png" => file("assets/icon.png", "image/png").await, _ => controller::utils::not_found(), }, - _ => match connected_user(&config, &pool, &request).await { + _ => match connected_user(&config, &db_conn, &request).await { Some(user) => { let wallet = Wallet { - pool, + db_conn, assets, templates, user, @@ -68,12 +68,12 @@ pub async fn routes( async fn connected_user( config: &Config, - pool: &SqlitePool, + db_conn: &Connection, request: &Request<Incoming>, ) -> Option<User> { let cookie = request.headers().get("COOKIE")?.to_str().ok()?; let login_token = cookie::extract_token(config, cookie).ok()?; - db::users::get_by_login_token(pool, login_token.to_string()).await + db::users::get_by_login_token(db_conn, login_token.to_string()).await } async fn authenticated_routes( |