diff --git a/src/server/mod.rs b/src/server/mod.rs index c86dc2a..7ceb245 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -10,8 +10,7 @@ use axum::{ extract::Request, http::StatusCode, middleware::Next, - response::{IntoResponse, Redirect, Response}, - routing::get, + response::{IntoResponse, Response}, Router, }; use http_body_util::BodyExt; @@ -26,11 +25,10 @@ pub struct Context { pub fn app(ctx: Context) -> Router { Router::new() .merge(gpodder::router(ctx.clone())) + .merge(web::router(ctx.clone())) .nest("/static", r#static::router()) - .nest("/_", web::router(ctx.clone())) - .route("/", get(|| async { Redirect::to("/_") })) .layer(axum::middleware::from_fn(header_logger)) - .layer(axum::middleware::from_fn(body_logger)) + // .layer(axum::middleware::from_fn(body_logger)) .layer(TraceLayer::new_for_http()) .with_state(ctx) } @@ -45,7 +43,7 @@ async fn header_logger(request: Request, next: Next) -> Response { res } -async fn body_logger(request: Request, next: Next) -> Response { +async fn _body_logger(request: Request, next: Next) -> Response { let (parts, body) = request.into_parts(); let bytes = match body diff --git a/src/server/web/mod.rs b/src/server/web/mod.rs index 44be6d8..6b93f6c 100644 --- a/src/server/web/mod.rs +++ b/src/server/web/mod.rs @@ -43,7 +43,7 @@ async fn get_login(State(ctx): State, headers: HeaderMap, jar: CookieJa .flatten() .is_some() { - Redirect::to("/_").into_response() + Redirect::to("/").into_response() } else { View::Login .page(&headers) @@ -87,7 +87,7 @@ async fn post_login( .path("/") .max_age(Duration::days(365)), ), - Redirect::to("/_"), + Redirect::to("/"), ) .into_response()), Err(AuthErr::UnknownUser | AuthErr::InvalidPassword) => { @@ -129,7 +129,7 @@ pub async fn auth_web_middleware( ) -> Response { // SAFETY: this extractor's error type is Infallible let jar: CookieJar = req.extract_parts().await.unwrap(); - let redirect = Redirect::to("/_/login"); + let redirect = Redirect::to("/login"); match extract_session(ctx, &jar).await { Ok(Some(session)) => { diff --git a/src/web/templates/views/login.html b/src/web/templates/views/login.html index fa6df57..ecd0898 100644 --- a/src/web/templates/views/login.html +++ b/src/web/templates/views/login.html @@ -1,5 +1,5 @@
-
+