diff --git a/src/web/mod.rs b/src/web/mod.rs index 2c47257..20931f1 100644 --- a/src/web/mod.rs +++ b/src/web/mod.rs @@ -1,9 +1,4 @@ -use axum::{ - Router, - http::header, - response::{IntoResponse, Redirect, Response}, - routing::get, -}; +use axum::{ Router, http::header, routing::get}; use crate::MnemoState; @@ -21,10 +16,3 @@ pub fn web_router() -> Router { ) .merge(pages::pages()) } - -pub struct RedirectViaError(Redirect); -impl IntoResponse for RedirectViaError { - fn into_response(self) -> Response { - self.0.into_response() - } -} diff --git a/src/web/pages/index.rs b/src/web/pages/index.rs index fc2e813..2580a38 100644 --- a/src/web/pages/index.rs +++ b/src/web/pages/index.rs @@ -1,7 +1,7 @@ use axum::response::{IntoResponse, Redirect, Response}; -use crate::users::auth::AuthError; +use crate::error::CompositeError; -pub async fn page() -> Result { +pub async fn page() -> Result { Ok(Redirect::to("/dashboard").into_response()) } diff --git a/src/web/pages/logs.rs b/src/web/pages/logs.rs index ea47d2f..6ab7754 100644 --- a/src/web/pages/logs.rs +++ b/src/web/pages/logs.rs @@ -23,7 +23,7 @@ pub async fn page( Query(query): Query, req: Request, ) -> Result { - let mut tx = state.pool.begin().await?; + let mut tx = state.pool.acquire().await?; let u = match User::authenticate(&mut *tx, req.headers()).await? { Some(u) => u, None => return Ok(Redirect::to(&format!("/login?r={}", req.uri().path())).into_response()), diff --git a/src/web/pages/users/profile.rs b/src/web/pages/users/profile.rs index ed4bc3e..72f6b14 100644 --- a/src/web/pages/users/profile.rs +++ b/src/web/pages/users/profile.rs @@ -20,7 +20,7 @@ pub async fn page( Path(id): Path, req: Request, ) -> Result { - let mut tx = state.pool.begin().await?; + let mut tx = state.pool.acquire().await?; let u = match User::authenticate(&mut *tx, req.headers()).await? { Some(u) => u, None => return Ok(Redirect::to(&format!("/login?r={}", req.uri().path())).into_response()),