From 652ea26b3204fd08000eb256900ca20f2327ab42 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Wed, 13 Aug 2025 11:22:18 +0200 Subject: [PATCH] remove cookie flash-messages; simply show uuid --- Cargo.lock | 124 ---------------------------------------------------- Cargo.toml | 2 - src/game.rs | 95 ++++++++++++++++++++-------------------- src/main.rs | 9 +--- src/page.rs | 101 +++++++++++++++++------------------------- 5 files changed, 89 insertions(+), 242 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36514d4..09d48e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,17 +53,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" -[[package]] -name = "async-trait" -version = "0.1.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "atoi" version = "2.0.0" @@ -156,22 +145,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-messages" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d67ce6e7bc1e1e71f2a4e86d418045a29c63c4ebb631f3d9bb2f81c4958ea391" -dependencies = [ - "axum-core", - "http", - "parking_lot", - "serde", - "serde_json", - "tower", - "tower-sessions-core", - "tracing", -] - [[package]] name = "backtrace" version = "0.3.75" @@ -408,7 +381,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" dependencies = [ "powerfmt", - "serde", ] [[package]] @@ -509,20 +481,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.31" @@ -567,17 +525,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "futures-sink" version = "0.3.31" @@ -598,7 +545,6 @@ checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1061,7 +1007,6 @@ checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", - "serde", ] [[package]] @@ -2248,22 +2193,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-cookies" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "151b5a3e3c45df17466454bb74e9ecedecc955269bdedbf4d150dfa393b55a36" -dependencies = [ - "axum-core", - "cookie", - "futures-util", - "http", - "parking_lot", - "pin-project-lite", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-http" version = "0.6.6" @@ -2302,57 +2231,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "tower-sessions" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a05911f23e8fae446005fe9b7b97e66d95b6db589dc1c4d59f6a2d4d4927d3" -dependencies = [ - "async-trait", - "http", - "time", - "tokio", - "tower-cookies", - "tower-layer", - "tower-service", - "tower-sessions-core", - "tower-sessions-memory-store", - "tracing", -] - -[[package]] -name = "tower-sessions-core" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8cce604865576b7751b7a6bc3058f754569a60d689328bb74c52b1d87e355b" -dependencies = [ - "async-trait", - "axum-core", - "base64", - "futures", - "http", - "parking_lot", - "rand", - "serde", - "serde_json", - "thiserror", - "time", - "tokio", - "tracing", -] - -[[package]] -name = "tower-sessions-memory-store" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb05909f2e1420135a831dd5df9f5596d69196d0a64c3499ca474c4bd3d33242" -dependencies = [ - "async-trait", - "time", - "tokio", - "tower-sessions-core", -] - [[package]] name = "tracing" version = "0.1.41" @@ -2637,7 +2515,6 @@ version = "0.1.0" dependencies = [ "axum", "axum-extra", - "axum-messages", "chrono", "maud", "rust-i18n", @@ -2645,7 +2522,6 @@ dependencies = [ "sqlx", "tokio", "tower-http", - "tower-sessions", "tracing", "tracing-subscriber", "uuid", diff --git a/Cargo.toml b/Cargo.toml index d290708..addd7ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ edition = "2024" [dependencies] axum = "0.8" axum-extra = { version = "0.10", features = ["cookie"] } -axum-messages = "0.8" chrono = { version = "0.4", features = ["serde"] } maud = { version = "0.27", features = ["axum"] } rust-i18n = "3.1" @@ -14,7 +13,6 @@ serde = { version = "1", features = ["derive"] } sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "sqlite", "macros", "chrono"] } tokio = { version = "1", features = ["macros", "rt-multi-thread"] } tower-http = { version = "0.6", features = ["fs"] } -tower-sessions = "0.14" tracing = "0.1.41" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } uuid = { version = "1.17", features = ["v4", "serde"] } diff --git a/src/game.rs b/src/game.rs index b9e24c5..56933e8 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,13 +1,16 @@ -use crate::{language::language, page::Page, Backend, NameUpdateError}; +use crate::{ + language::language, + page::{MyMessage, Page}, + Backend, NameUpdateError, +}; use axum::{ extract::{Path, State}, http::HeaderMap, - response::{IntoResponse, Redirect, Response}, + response::{IntoResponse, Response}, routing::{get, post}, Form, Router, }; use axum_extra::extract::CookieJar; -use axum_messages::Messages; use maud::{html, Markup, PreEscaped}; use serde::Deserialize; use std::sync::Arc; @@ -16,13 +19,18 @@ use uuid::Uuid; async fn index( State(backend): State>, cookies: CookieJar, - messages: Messages, headers: HeaderMap, ) -> Response { - tracing::info!("in /index"); + retu(backend, cookies, headers, None).await +} + +async fn retu( + backend: Arc, + cookies: CookieJar, + headers: HeaderMap, + message: Option, +) -> Response { let (cookies, req) = backend.client_full(cookies, &headers).await; - tracing::info!("cookies = {cookies:#?}"); - tracing::info!("req = {req:#?}"); let client = req.client; rust_i18n::set_locale(&req.lang.to_string()); @@ -31,7 +39,9 @@ async fn index( let highscore = backend.highscore().await; let mut page = Page::new(req.lang); - page.messages(messages); + if let Some(message) = message { + page.set_message(message); + } let markup = page.content(html! { hgroup { h1 { (t!("game_title")) } @@ -98,33 +108,31 @@ async fn game( State(backend): State>, cookies: CookieJar, headers: HeaderMap, - messages: Messages, Path(uuid): Path, -) -> Result { +) -> Response { let (cookies, req) = backend.client_full(cookies, &headers).await; let client = req.client; rust_i18n::set_locale(req.lang.to_locale()); let Ok(uuid) = Uuid::parse_str(&uuid) else { - return Err(not_found(cookies, headers).await.into_response()); + return not_found(cookies, headers).await.into_response(); }; let Some(camera) = backend.get_camera(&uuid).await else { - return Err(not_found(cookies, headers).await.into_response()); + return not_found(cookies, headers).await.into_response(); }; - if let Ok(number) = backend.client_found_camera(&client, &camera).await { - messages.info(format!("found-cam|{}|{number}", camera.name)); + let message = if let Ok(number) = backend.client_found_camera(&client, &camera).await { + MyMessage::FoundCam(camera.name, number) } else { - messages.info(format!( - "err|{}|{}|{}", - t!("error_already_found_title"), - t!("error_already_found_body"), - t!("error_already_found_footer") - )); - } + MyMessage::Error( + t!("error_already_found_title").into(), + t!("error_already_found_body").into(), + t!("error_already_found_footer").into(), + ) + }; - Ok(Redirect::to("/game")) + retu(backend, cookies, headers, Some(message)).await } async fn not_found(cookies: CookieJar, headers: HeaderMap) -> Markup { @@ -142,7 +150,6 @@ struct NameForm { async fn set_name( State(backend): State>, cookies: CookieJar, - messages: Messages, headers: HeaderMap, Form(form): Form, ) -> Response { @@ -150,32 +157,26 @@ async fn set_name( let client = req.client; rust_i18n::set_locale(req.lang.to_locale()); - match backend.set_client_name(&client, &form.name).await { - Ok(()) => messages.info("set-name-succ"), - Err(NameUpdateError::TooShort(expected, actual)) => messages.info(format!( - "err|{}|{}|{}: {}", - t!("error_name_too_short_title"), - t!("error_name_too_short_body", expected = expected), - t!("received_characters"), - actual - )), - Err(NameUpdateError::TooLong(expected, actual)) => messages.info(format!( - "err|{}|{}|{}: {}", - t!("error_name_too_long_title"), - t!("error_name_too_long_body", expected = expected), - t!("received_characters"), - actual - )), - Err(NameUpdateError::ContainsBadWord) => messages.info(format!( - "err|{}|{}|{}", - t!("error_bad_word_title"), - t!("error_bad_word_body"), - t!("error_bad_word_footer") - )), + let message = match backend.set_client_name(&client, &form.name).await { + Ok(()) => MyMessage::NameChanged, + Err(NameUpdateError::TooShort(expected, actual)) => MyMessage::Error( + t!("error_name_too_short_title").into(), + t!("error_name_too_short_body", expected = expected).into(), + format!("{}: {actual}", t!("received_characters")), + ), + Err(NameUpdateError::TooLong(expected, actual)) => MyMessage::Error( + t!("error_name_too_long_title").into(), + t!("error_name_too_long_body", expected = expected).into(), + format!("{}: {actual}", t!("received_characters")), + ), + Err(NameUpdateError::ContainsBadWord) => MyMessage::Error( + t!("error_bad_word_title").into(), + t!("error_bad_word_body").into(), + t!("error_bad_word_footer").into(), + ), }; - // Redirect back to the game page - (cookies, Redirect::to("/game")).into_response() + retu(backend, cookies, headers, Some(message)).await } pub(super) fn routes() -> Router> { diff --git a/src/main.rs b/src/main.rs index cfe970c..50694b1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,6 @@ use crate::model::client::Client; use axum::{http::HeaderMap, routing::get, Router}; use axum_extra::extract::{cookie::Cookie, CookieJar}; -use axum_messages::MessagesManagerLayer; use sqlx::{pool::PoolOptions, sqlite::SqliteConnectOptions, SqlitePool}; use std::{ collections::HashSet, @@ -10,7 +9,6 @@ use std::{ sync::{Arc, LazyLock}, }; use tower_http::services::ServeDir; -use tower_sessions::{MemoryStore, SessionManagerLayer}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter}; use uuid::Uuid; @@ -199,9 +197,6 @@ async fn main() { .with(EnvFilter::from_default_env()) .init(); - let session_store = MemoryStore::default(); - let session_layer = SessionManagerLayer::new(session_store).with_secure(false); - let connection_options = SqliteConnectOptions::from_str("sqlite://db.sqlite").unwrap(); let db: SqlitePool = PoolOptions::new() .connect_with(connection_options) @@ -212,9 +207,7 @@ async fn main() { .route("/", get(index::index)) .nest_service("/static", ServeDir::new("./static/serve")) .merge(game::routes()) - .with_state(Arc::new(Backend::Sqlite(db))) - .layer(MessagesManagerLayer) - .layer(session_layer); + .with_state(Arc::new(Backend::Sqlite(db))); // run our app with hyper, listening globally on port 3000 let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap(); diff --git a/src/page.rs b/src/page.rs index 9f71d99..adc99f9 100644 --- a/src/page.rs +++ b/src/page.rs @@ -1,52 +1,27 @@ use crate::Language; -use axum_messages::Messages; -use maud::{DOCTYPE, Markup, html}; +use maud::{html, Markup, DOCTYPE}; pub(crate) struct Page { lang: Language, - found_camera: Option<(String, i64)>, - new_name: bool, - err: Option<(String, String, String)>, + message: Option, +} + +pub(crate) enum MyMessage { + NameChanged, + FoundCam(String, i64), + Error(String, String, String), } impl Page { pub fn new(lang: Language) -> Self { Self { lang, - found_camera: None, - new_name: false, - err: None, + message: None, } } - pub fn messages(&mut self, messages: Messages) { - for message in messages { - let text = &message.to_string()[..]; - match (message.level, text) { - (_, "set-name-succ") => { - self.new_name = true; - } - (_, msg) if msg.starts_with("found-cam|") => { - let mut parts = msg.splitn(3, '|'); - let _ = parts.next().expect("just checked |"); - if let (Some(name), Some(amount)) = (parts.next(), parts.next()) { - if let Ok(amount) = amount.parse::() { - self.found_camera = Some((name.into(), amount)); - } - } - } - (_, msg) if msg.starts_with("err|") => { - let mut parts = msg.splitn(4, '|'); - let _ = parts.next().expect("just checked |"); - if let (Some(title), Some(body), Some(footer)) = - (parts.next(), parts.next(), parts.next()) - { - self.err = Some((title.into(), body.into(), footer.into())); - } - } - (_, _) => {} - } - } + pub(crate) fn set_message(&mut self, message: MyMessage) { + self.message = Some(message); } pub fn content(self, content: Markup) -> Markup { @@ -92,35 +67,39 @@ impl Page { } main.container { - @if let Some(found_camera) = &self.found_camera { - div.flex { - article class="succ msg" { - header { (t!("found_camera_title", name = found_camera.0)) } - (t!("found_camera_body", amount = found_camera.1)) - footer { - a href="#ranking" { (t!("see_ranking")) } + @if let Some(message) = &self.message { + @match message { + MyMessage::FoundCam(name, amount) => { + div.flex { + article class="succ msg" { + header { (t!("found_camera_title", name = name)) } + (t!("found_camera_body", amount = amount)) + footer { + a href="#ranking" { (t!("see_ranking")) } + } + } + } + }, + MyMessage::NameChanged => { + div.flex { + article class="name msg" { + header { (t!("new_name_title")) } + (t!("new_name_message")) + } + } + }, + MyMessage::Error(header, body, footer) => { + div.flex { + article class="error msg" { + header { (header) } + (body) + footer { (footer) } + } } } } - } - @if self.new_name { - div.flex { - article class="name msg" { - header { (t!("new_name_title")) } - (t!("new_name_message")) - } - } - } - @if let Some(err) = &self.err { - div.flex { - article class="error msg" { - header { (err.0) } - (err.1) - footer { (err.2) } - } - } - } + } section { (content) } }