don't acquire useless transasctions, misc

src/web/mod.rs

@@ -1,9 +1,4 @@
-use axum::{
+use axum::{ Router, http::header, routing::get};
-    Router,
-    http::header,
-    response::{IntoResponse, Redirect, Response},
-    routing::get,
-};
 
 use crate::MnemoState;
 
@@ -21,10 +16,3 @@ pub fn web_router() -> Router<MnemoState> {
         )
         .merge(pages::pages())
 }
-
-pub struct RedirectViaError(Redirect);
-impl IntoResponse for RedirectViaError {
-    fn into_response(self) -> Response {
-        self.0.into_response()
-    }
-}

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<Response, AuthError> {
+pub async fn page() -> Result<Response, CompositeError> {
     Ok(Redirect::to("/dashboard").into_response())
 }

src/web/pages/logs.rs

@@ -23,7 +23,7 @@ pub async fn page(
     Query(query): Query<PageQuery>,
     req: Request,
 ) -> Result<Response, CompositeError> {
-    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()),

src/web/pages/users/profile.rs

@@ -20,7 +20,7 @@ pub async fn page(
     Path(id): Path<Uuid>,
     req: Request,
 ) -> Result<Response, CompositeError> {
-    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()),