diff --git a/src/application/routes/bags.rs b/src/application/routes/bags.rs index be22575..c711afe 100644 --- a/src/application/routes/bags.rs +++ b/src/application/routes/bags.rs @@ -77,8 +77,7 @@ pub(crate) async fn bags_page( let request = query.into_request::(); if is_datastar_request(&headers) { - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; return render_bag_list_fragment(state, request, is_authenticated) .await .map_err(map_app_error); @@ -100,8 +99,7 @@ pub(crate) async fn bags_page( .await .map_err(map_app_error)?; - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = BagsTemplate { nav_active: "bags", diff --git a/src/application/routes/mod.rs b/src/application/routes/mod.rs index 557de98..972bd00 100644 --- a/src/application/routes/mod.rs +++ b/src/application/routes/mod.rs @@ -7,6 +7,8 @@ pub mod support; pub mod timeline; pub mod tokens; +pub(crate) use auth::is_authenticated; + use askama::Template; use axum::http::StatusCode; use axum::response::{Html, IntoResponse, Redirect}; diff --git a/src/application/routes/roasters.rs b/src/application/routes/roasters.rs index 6c51f40..82dd6e4 100644 --- a/src/application/routes/roasters.rs +++ b/src/application/routes/roasters.rs @@ -52,8 +52,7 @@ pub(crate) async fn roasters_page( let request = query.into_request::(); if is_datastar_request(&headers) { - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; return render_roaster_list_fragment(state, request, is_authenticated) .await .map_err(map_app_error); @@ -63,8 +62,7 @@ pub(crate) async fn roasters_page( .await .map_err(map_app_error)?; - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = RoastersTemplate { nav_active: "roasters", @@ -94,8 +92,7 @@ pub(crate) async fn roaster_page( .map_err(|err| map_app_error(AppError::from(err)))?; let roaster_view = RoasterView::from(roaster); - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = RoasterDetailTemplate { nav_active: "roasters", diff --git a/src/application/routes/roasts.rs b/src/application/routes/roasts.rs index 3c4eb06..028c9df 100644 --- a/src/application/routes/roasts.rs +++ b/src/application/routes/roasts.rs @@ -55,8 +55,7 @@ pub(crate) async fn roasts_page( let request = query.into_request::(); if is_datastar_request(&headers) { - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; return render_roast_list_fragment(state, request, is_authenticated) .await .map_err(map_app_error); @@ -74,8 +73,7 @@ pub(crate) async fn roasts_page( .await .map_err(map_app_error)?; - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = RoastsTemplate { nav_active: "roasts", @@ -119,8 +117,7 @@ pub(crate) async fn roast_page( .map(crate::presentation::web::views::BagView::from_domain) .collect(); - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = RoastDetailTemplate { nav_active: "roasts", diff --git a/src/application/routes/timeline.rs b/src/application/routes/timeline.rs index a5f78e5..beafc1a 100644 --- a/src/application/routes/timeline.rs +++ b/src/application/routes/timeline.rs @@ -36,8 +36,7 @@ pub(crate) async fn timeline_page( .await .map_err(map_app_error)?; - let is_authenticated = - crate::application::routes::auth::is_authenticated(&state, &cookies).await; + let is_authenticated = super::is_authenticated(&state, &cookies).await; let template = TimelineTemplate { nav_active: "timeline",