Finish setting up session store

I think

Cargo.toml

@@ -26,4 +26,5 @@ sqlx = { version = "0.7.3", features = ["runtime-tokio", "sqlite", "chrono", "uu
 tokio = { version = "1.36.0", features = ["full"] }
 toml = "0.8.10"
 tower = "0.4.13"
-tower-sessions-sqlx-store = "0.10.0"
+tower-sessions = "0.10.3"
+tower-sessions-sqlx-store = { version = "0.10.0", features = ["sqlite"] }

src/main.rs

@@ -16,12 +16,14 @@ use std::{
 };
 use tokio::signal;
 use tower::ServiceBuilder;
+use tower_sessions::SessionManagerLayer;
+use tower_sessions_sqlx_store::SqliteStore;
 
 mod endpoints;
 mod middleware;
 mod shared;
 
-/// New vZDV website.
+/// vZDV website.
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
 struct Cli {
@@ -79,10 +81,17 @@ async fn load_db(config: &Config) -> Result<SqlitePool> {
 }
 
 /// Create all the endpoints, include middleware, and connect with the state.
-fn load_router(app_state: Arc<AppState>) -> Router {
+fn load_router(
+    app_state: Arc<AppState>,
+    sessions_layer: SessionManagerLayer<SqliteStore>,
+) -> Router {
     Router::new()
         .route("/", get(endpoints::handler_home))
-        .layer(ServiceBuilder::new().layer(axum_middleware::from_fn(middleware::logging)))
+        .layer(
+            ServiceBuilder::new()
+                .layer(axum_middleware::from_fn(middleware::logging))
+                .layer(sessions_layer),
+        )
         .with_state(app_state)
 }
 
@@ -143,6 +152,12 @@ async fn main() {
             std::process::exit(1);
         }
     };
+    let sessions = SqliteStore::new(db.clone());
+    if let Err(e) = sessions.migrate().await {
+        error!("Could not create table for sessions: {e}");
+        return;
+    }
+    let session_layer = SessionManagerLayer::new(sessions);
     let templates = load_templates();
     debug!("Loaded");
 
@@ -152,7 +167,7 @@ async fn main() {
         db,
         templates,
     });
-    let app = load_router(app_state);
+    let app = load_router(app_state, session_layer);
     debug!("Set up");
 
     let host_and_port = format!("{}:{}", cli.host, cli.port);

src/shared/mod.rs

@@ -1,6 +1,6 @@
 //! Structs and data to be shared across multiple parts of the site.
 
-#![allow(unused, clippy::upper_case_acronyms)]
+#![allow(unused)]
 
 use minijinja::Environment;
 use sqlx::SqlitePool;
@@ -16,6 +16,7 @@ pub struct AppState {
     pub templates: Environment<'static>,
 }
 
+#[allow(clippy::upper_case_acronyms)]
 pub enum ControllerRating {
     OBS,
     S1,
@@ -36,6 +37,7 @@ pub enum ControllerStatus {
     LeaveOfAbsence,
 }
 
+#[allow(clippy::upper_case_acronyms)]
 pub enum StaffPosition {
     None,
     ATM,

src/shared/sql.rs

@@ -30,14 +30,6 @@ pub struct Certification {
     pub set_by: Uuid,
 }
 
-#[derive(Debug, FromRow)]
-pub struct Session {
-    pub id: Uuid,
-    pub controller_id: Uuid,
-    pub vatsim_token: String,
-    pub started: DateTime<Utc>,
-}
-
 /// Statements to create tables. Only ran when the DB file does not exist,
 /// so no migration or "IF NOT EXISTS" conditions need to be added.
 pub const CREATE_TABLES: &str = "
@@ -64,13 +56,4 @@ CREATE TABLE certification (
 
     FOREIGN KEY (controller_id) REFERENCES controller(id)
 );
-
-CREATE TABLE session (
-    id TEXT PRIMARY KEY NOT NULL,
-    controller_id TEXT NOT NULL UNIQUE,
-    vatsim_token TEXT NOT NULL UNIQUE,
-    started TEXT NOT NULL,
-
-    FOREIGN KEY (controller_id) REFERENCES controller(id)
-);
 ";