Add working password update

Signed-off-by: Marcel Müller <neikos@neikos.email>

nixie-server/.env

@@ -1 +1 @@
-DATABASE_URL=sqlite://database.db
+DATABASE_URL=sqlite:database.db

nixie-server/.gitignore

@@ -1 +1,4 @@
 database.db*
+
+node_modules
+public/

nixie-server/Cargo.toml

@@ -10,7 +10,7 @@ readme.workspace = true
 axum = { workspace = true, features = ["macros"] }
 tokio = { workspace = true, features = ["full"] }
 axum-login = { workspace = true }
-sqlx = { workspace = true, features = ["runtime-tokio", "sqlite"] }
+sqlx = { workspace = true, features = ["runtime-tokio", "sqlite", "time"] }
 anyhow.workspace = true
 tower-sessions = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
@@ -21,8 +21,9 @@ password-auth = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tera = "1.20.1"
-notify-debouncer-full = "0.6.0"
+notify-debouncer-full = "0.7.0"
 tower-livereload = "0.10.2"
 time = "0.3.45"
 rand = "0.9.2"
 serde_json.workspace = true
+tower-http = { version = "0.6.8", features = ["normalize-path", "fs"] }

nixie-server/migrations/20260123170914_create_api_keys.up.sql

@@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS api_keys
     user_id INTEGER NOT NULL REFERENCES users(id),
     token TEXT NOT NULL,
     name TEXT NOT NULL,
-    expiration_date TEXT NOT NULL,
+    expiration_date DATE NOT NULL,
     permissions TEXT NOT NULL,
     revoked BOOLEAN NOT NULL
 );

nixie-server/package-lock.json

@@ -0,0 +1,18 @@
+{
+  "name": "nixie-server",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "tailwindcss": "^4.1.18"
+      }
+    },
+    "node_modules/tailwindcss": {
+      "version": "4.1.18",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz",
+      "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==",
+      "license": "MIT"
+    }
+  }
+}

nixie-server/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "tailwindcss": "^4.1.18"
+  }
+}

nixie-server/src/main.rs

@@ -20,6 +20,8 @@ use tera::Tera;
 use thiserror::Error;
 use tokio::task;
 use tokio::task::AbortHandle;
+use tower_http::normalize_path::NormalizePathLayer;
+use tower_http::services::ServeDir;
 use tower_livereload::LiveReloadLayer;
 use tower_sessions::ExpiredDeletion;
 use tower_sessions::SessionManagerLayer;
@@ -30,16 +32,22 @@ use tracing_subscriber::EnvFilter;
 pub mod settings;
 pub mod users;
 
-pub type WebResult<T> = Result<T, AppError>;
-pub type TemplatedHtml = Html<String>;
+pub(crate) type WebResult<T> = Result<T, AppError>;
+pub(crate) type TemplatedHtml = Html<String>;
 
 #[derive(Debug, Error, Display)]
-pub enum AppError {
+pub(crate) enum AppError {
     /// An error occurred while templating
     Tera(#[from] tera::Error),
 
     /// An error occurred while interacting with the database
     Sqlx(#[from] sqlx::Error),
+
+    /// An error occurred while interacting with the sessions
+    Session(#[from] tower_sessions::session::Error),
+
+    /// An error ocurred while interacting with user logins
+    Login(#[from] axum_login::Error<Backend>),
 }
 
 impl IntoResponse for AppError {
@@ -51,7 +59,7 @@ impl IntoResponse for AppError {
             Html(
                 TERA.read()
                     .unwrap()
-                    .render("internal_error.tera.html", &error_context)
+                    .render("internal_error.html.tera", &error_context)
                     .unwrap_or_else(|_| "ERROR RENDERING ERROR! FATAL".to_string()),
             ),
         )
@@ -67,7 +75,7 @@ async fn main() -> anyhow::Result<()> {
 type AuthSession = axum_login::AuthSession<Backend>;
 
 #[derive(Debug, Clone)]
-struct Backend {
+pub(crate) struct Backend {
     db: SqlitePool,
 }
 
@@ -125,7 +133,7 @@ pub struct AppState {
 }
 
 pub static TERA: LazyLock<std::sync::RwLock<Tera>> =
-    LazyLock::new(|| Tera::new("templates/**.tera.html").unwrap().into());
+    LazyLock::new(|| Tera::new("templates/**.html.tera").unwrap().into());
 
 async fn run() -> anyhow::Result<()> {
     tracing_subscriber::fmt()
@@ -156,8 +164,13 @@ async fn run() -> anyhow::Result<()> {
     let app = Router::new()
         .merge(users::routes())
         .merge(settings::routes())
+        .nest_service(
+            "/assets",
+            ServeDir::new("public").append_index_html_on_directories(false),
+        )
         .route("/", get(show_index))
         .layer(auth_layer)
+        .layer(NormalizePathLayer::trim_trailing_slash())
         .layer(livereload)
         .with_state(AppState { db });
 
@@ -193,16 +206,18 @@ async fn run() -> anyhow::Result<()> {
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
     axum::serve(listener, app.into_make_service())
-        .with_graceful_shutdown(shutdown_signal(deletion_task.abort_handle()))
-        .await?;
+        .with_graceful_shutdown(async move {
+            shutdown_signal(deletion_task.abort_handle()).await;
 
-    debouncer.stop();
+            debouncer.stop_nonblocking();
+        })
+        .await?;
 
     Ok(())
 }
 
 async fn show_index(renderer: Renderer) -> WebResult<Html<String>> {
-    renderer.render_template("index.tera.html", None)
+    renderer.render_template("index.html.tera", None)
 }
 
 async fn shutdown_signal(handle: AbortHandle) {
@@ -233,7 +248,7 @@ pub struct Renderer {
 }
 
 impl Renderer {
-    pub fn render_template(
+    pub(crate) fn render_template(
         &self,
         name: &str,
         context: impl Into<Option<Context>>,

nixie-server/src/settings/mod.rs

@@ -7,6 +7,7 @@ use axum::routing::get;
 use axum::routing::post;
 use axum_login::login_required;
 use password_auth::generate_hash;
+use password_auth::verify_password;
 use rand::distr::Alphanumeric;
 use rand::distr::SampleString;
 use rand::rng;
@@ -15,7 +16,6 @@ use serde::Serialize;
 use sqlx::prelude::FromRow;
 use tera::Context;
 use time::Date;
-use time::Duration;
 use time::OffsetDateTime;
 use time::Time;
 
@@ -37,14 +37,56 @@ pub fn routes() -> Router<AppState> {
 }
 
 async fn show_settings(renderer: Renderer) -> WebResult<TemplatedHtml> {
-    renderer.render_template("settings/index.tera.html", None)
+    renderer.render_template("settings/index.html.tera", None)
 }
 
 async fn show_change_password(renderer: Renderer) -> WebResult<TemplatedHtml> {
-    renderer.render_template("settings/change_password.tera.html", None)
+    renderer.render_template("settings/change_password.html.tera", None)
 }
 
-async fn do_change_password() {}
+#[derive(Deserialize)]
+struct ChangePasswordForm {
+    old_password: String,
+    password: String,
+    confirm_password: String,
+}
+
+async fn do_change_password(
+    app_state: State<AppState>,
+    auth: AuthSession,
+    change_password: Form<ChangePasswordForm>,
+) -> WebResult<impl IntoResponse> {
+    let old_password = change_password.old_password.clone();
+    let hash = auth.user.as_ref().unwrap().password().to_string();
+
+    let wrong_password =
+        tokio::task::spawn_blocking(move || verify_password(&old_password, &hash).is_err())
+            .await
+            .unwrap();
+
+    if wrong_password {
+        panic!("WRONG PASSWORD?");
+    }
+
+    if change_password.password != change_password.confirm_password {
+        panic!("Passwords are not equal...");
+    }
+
+    let hashed_password =
+        tokio::task::spawn_blocking(move || generate_hash(&change_password.password))
+            .await
+            .unwrap();
+
+    sqlx::query("UPDATE users SET password = ? WHERE id = ?")
+        .bind(&hashed_password)
+        .bind(auth.user.unwrap().id())
+        .execute(&app_state.db)
+        .await?;
+
+    auth.session.delete().await?;
+
+    Ok(())
+}
 
 #[derive(Debug, FromRow, Serialize)]
 pub struct ApiKey {
@@ -52,7 +94,7 @@ pub struct ApiKey {
     user_id: i64,
     token: Vec<u8>,
     name: String,
-    expiration_date: OffsetDateTime,
+    expiration_date: Date,
     permissions: String,
     revoked: bool,
 }
@@ -87,7 +129,7 @@ async fn show_api_keys(
             .unwrap(),
     );
 
-    renderer.render_template("settings/api_keys.tera.html", context)
+    renderer.render_template("settings/api_keys.html.tera", context)
 }
 
 #[derive(Debug, Deserialize)]

nixie-server/src/users/login.rs

@@ -1,8 +1,8 @@
 use axum::Form;
-use axum::http::StatusCode;
 use axum::response::Html;
 use axum::response::IntoResponse;
 use axum::response::Redirect;
+use tera::Context;
 
 use crate::AuthSession;
 use crate::Renderer;
@@ -10,22 +10,33 @@ use crate::UserCredentials;
 use crate::WebResult;
 
 pub async fn show_login(renderer: Renderer) -> WebResult<Html<String>> {
-    renderer.render_template("users/login.tera.html", None)
+    renderer.render_template("users/login.html.tera", None)
 }
 
 pub async fn do_login(
     mut auth_session: AuthSession,
+    renderer: Renderer,
     Form(creds): Form<UserCredentials>,
-) -> impl IntoResponse {
-    let user = match auth_session.authenticate(creds.clone()).await {
-        Ok(Some(user)) => user,
-        Ok(None) => return StatusCode::UNAUTHORIZED.into_response(),
-        Err(_) => return StatusCode::INTERNAL_SERVER_ERROR.into_response(),
+) -> WebResult<impl IntoResponse> {
+    let user = match auth_session.authenticate(creds.clone()).await? {
+        Some(user) => user,
+        None => {
+            let mut context = Context::new();
+
+            context.insert(
+                "form",
+                &serde_json::json! {{
+                    "username": creds.username
+                }},
+            );
+
+            return Ok(renderer
+                .render_template("users/login.html.tera", context)
+                .into_response());
+        }
     };
 
-    if auth_session.login(&user).await.is_err() {
-        return StatusCode::INTERNAL_SERVER_ERROR.into_response();
-    }
+    auth_session.login(&user).await?;
 
-    Redirect::to("/protected").into_response()
+    Ok(Redirect::to("/protected").into_response())
 }

nixie-server/src/users/register.rs

@@ -11,7 +11,7 @@ use crate::UserCredentials;
 use crate::WebResult;
 
 pub async fn show_register(renderer: Renderer) -> WebResult<Html<String>> {
-    renderer.render_template("users/register.tera.html", None)
+    renderer.render_template("users/register.html.tera", None)
 }
 
 pub async fn do_register(

nixie-server/templates/base.css

@@ -0,0 +1 @@
+@import "tailwindcss";

nixie-server/templates/base.html.tera

@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
+    <link rel="stylesheet" href="/assets/style.css" />
     <script type="module" src="https://cdn.jsdelivr.net/gh/starfederation/datastar@1.0.0-RC.7/bundles/datastar.js"></script>
     {% block head %}
     <title>{% block title %}{% endblock title%} - Nixie CI</title>
@@ -12,7 +12,7 @@
 </head>
 
 <body class="min-h-screen flex flex-col">
-    <nav class="bg-orange-300 px-2 py-2 inset-shadow-2xs border-b-2 border-orange-900">
+    <nav class="bg-orange-200 px-2 py-2 inset-shadow-2xs border-b-2 border-orange-900">
         <div class="mx-auto container flex select-none space-x-4">
             <a href="/" class="outline-2 outline-gray-800 bg-gray-700 rounded text-white p-2">
                 <span class="text-green-200">>_</span>
@@ -27,13 +27,13 @@
                 <a href="/register" class="outline-2 hover:outline-emerald-900 outline-blue-700 p-2 select-none rounded-r bg-blue-600 text-white">Register</a>
             {% else %}
                 <div class="relative flex" data-on:click__outside="$openProfileDropdown = false">
-                    <a href="/users/{{ current_user.id }}" class="inline-block border-2 border-r-1 hover:border-emerald-900 border-emerald-700 p-2 select-none rounded-l bg-emerald-600 text-white">
+                    <a href="/users/{{ current_user.id }}" class="inline-block border-2 border-r hover:border-emerald-900 border-emerald-700 p-2 select-none rounded-l bg-emerald-600 text-white">
                         {{ current_user.username }}
                     </a>
                     <button data-on:click="$openProfileDropdown = !$openProfileDropdown"
-                        class="border-2 border-l-1 hover:border-emerald-900 border-emerald-700 p-2 select-none rounded-r bg-emerald-600 text-white cursor-pointer">&#9660;</button>
-                    <div data-class:hidden="!$openProfileDropdown"
-                        class="hidden absolute top-[calc(100%+0.4rem)] right-0 bg-orange-300 p-2 rounded-b border border-orange-800 shadow-lg md:min-w-40 flex flex-col divide-y divide-orange-800">
+                        class="border-2 border-l hover:border-emerald-900 border-emerald-700 p-2 select-none rounded-r bg-emerald-600 text-white cursor-pointer">&#9660;</button>
+                    <div data-class:flex="$openProfileDropdown" data-class:hidden="!$openProfileDropdown"
+                        class="hidden absolute top-[calc(100%+0.4rem)] right-0 bg-orange-300 p-2 rounded-b border border-orange-800 shadow-lg md:min-w-40 flex-col divide-y divide-orange-800">
                         <a class="block p-2 hover:bg-orange-800 hover:text-white" href="/users/{{ current_user.id }}">Profile</a>
                         <a class="block p-2 hover:bg-orange-800 hover:text-white" href="/logout">Logout</a>
                     </div>

nixie-server/templates/index.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Home

nixie-server/templates/internal_error.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Home

nixie-server/templates/protected.html.tera

@@ -1,4 +1,4 @@
-{% extends "base.tera.html" %}
+{% extends "base.html.tera" %}
 
 {% block title %}
 Protected Page

nixie-server/templates/settings/api_keys.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 API Keys - {{ current_user.username }}
@@ -8,7 +8,7 @@ API Keys - {{ current_user.username }}
 {% block content %}
 <div class="flex flex-col md:flex-row grow">
     <div class="basis-1/4 p-4 m-4 space-y-4">
-        {% include "settings/sidebar.tera.html" %}
+        {% include "settings/sidebar.html.tera" %}
     </div>
     <div class="basis-3/4 p-4">
         <h1 class="font-bold text-3xl">API Keys</h1>

nixie-server/templates/settings/change_password.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Change Password - {{ current_user.username }}
@@ -8,7 +8,7 @@ Change Password - {{ current_user.username }}
 {% block content %}
 <div class="flex flex-col md:flex-row grow">
     <div class="basis-1/4 p-4 m-4 space-y-4">
-        {% include "settings/sidebar.tera.html" %}
+        {% include "settings/sidebar.html.tera" %}
     </div>
     <div class="basis-3/4 p-4">
         <h1 class="font-bold text-3xl">Change Password</h1>

nixie-server/templates/settings/index.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Settings - {{ current_user.username }}
@@ -8,7 +8,7 @@ Settings - {{ current_user.username }}
 {% block content %}
 <div class="flex flex-col md:flex-row grow">
     <div class="basis-1/4 p-4 m-4 space-y-4">
-        {% include "settings/sidebar.tera.html" %}
+        {% include "settings/sidebar.html.tera" %}
     </div>
     <div class="basis-3/4 p-4">
         <p>THIS IS YOUR MAIN SETTINGS WOOHOOOO</p>

nixie-server/templates/users/login.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Login
@@ -10,7 +10,7 @@ Login
     <div class="border-2 border-zinc-300 sm:rounded-2xl lg:rounded-4xl my-2 px-20 pb-14 pt-10 sm:shadow-lg space-y-4">
         <h1 class="font-bold text-3xl">Login</h1>
         <form action="/login" method="POST" class="space-y-4">
-            {{ inputs::text_input(label="Username", name="username", id="username") }}
+            {{ inputs::text_input(label="Username", name="username", id="username", value=form.username | default(value="")) }}
             {{ inputs::text_input(label="Password", name="password", id="password", type="password") }}
             <div class="flex flex-col">
                 <button type="submit" class="bg-blue-500 p-2 rounded-lg text-white">

nixie-server/templates/users/register.html.tera

@@ -1,5 +1,5 @@
-{% extends "base.tera.html" %}
-{% import "inputs.tera.html" as inputs %}
+{% extends "base.html.tera" %}
+{% import "inputs.html.tera" as inputs %}
 
 {% block title %}
 Register