From ea74daca4809e4008dd8d01039db9fff3be659d9 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 16 Oct 2024 20:14:33 -0400
Subject: Organizational pass on endpoints and routes.

---
 src/setup/routes.rs      | 50 ------------------------------------------------
 src/setup/routes/mod.rs  |  9 +++++++++
 src/setup/routes/post.rs | 44 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 50 deletions(-)
 delete mode 100644 src/setup/routes.rs
 create mode 100644 src/setup/routes/mod.rs
 create mode 100644 src/setup/routes/post.rs

(limited to 'src/setup')

diff --git a/src/setup/routes.rs b/src/setup/routes.rs
deleted file mode 100644
index ff41734..0000000
--- a/src/setup/routes.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use axum::{
-    extract::{Json, State},
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    routing::post,
-    Router,
-};
-
-use super::app;
-use crate::{
-    app::App, clock::RequestedAt, error::Internal, login::Password, token::extract::IdentityToken,
-};
-
-pub fn router() -> Router<App> {
-    Router::new().route("/api/setup", post(on_setup))
-}
-
-#[derive(serde::Deserialize)]
-struct SetupRequest {
-    name: String,
-    password: Password,
-}
-
-async fn on_setup(
-    State(app): State<App>,
-    RequestedAt(setup_at): RequestedAt,
-    identity: IdentityToken,
-    Json(request): Json<SetupRequest>,
-) -> Result<(IdentityToken, StatusCode), SetupError> {
-    let secret = app
-        .setup()
-        .initial(&request.name, &request.password, &setup_at)
-        .await
-        .map_err(SetupError)?;
-    let identity = identity.set(secret);
-    Ok((identity, StatusCode::NO_CONTENT))
-}
-
-#[derive(Debug)]
-struct SetupError(app::Error);
-
-impl IntoResponse for SetupError {
-    fn into_response(self) -> Response {
-        let Self(error) = self;
-        match error {
-            app::Error::SetupCompleted => (StatusCode::CONFLICT, error.to_string()).into_response(),
-            other => Internal::from(other).into_response(),
-        }
-    }
-}
diff --git a/src/setup/routes/mod.rs b/src/setup/routes/mod.rs
new file mode 100644
index 0000000..e1e1711
--- /dev/null
+++ b/src/setup/routes/mod.rs
@@ -0,0 +1,9 @@
+use axum::{routing::post, Router};
+
+use crate::app::App;
+
+mod post;
+
+pub fn router() -> Router<App> {
+    Router::new().route("/api/setup", post(post::handler))
+}
diff --git a/src/setup/routes/post.rs b/src/setup/routes/post.rs
new file mode 100644
index 0000000..9e6776f
--- /dev/null
+++ b/src/setup/routes/post.rs
@@ -0,0 +1,44 @@
+use axum::{
+    extract::{Json, State},
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
+
+use crate::{
+    app::App, clock::RequestedAt, error::Internal, login::Password, setup::app,
+    token::extract::IdentityToken,
+};
+
+pub async fn handler(
+    State(app): State<App>,
+    RequestedAt(setup_at): RequestedAt,
+    identity: IdentityToken,
+    Json(request): Json<Request>,
+) -> Result<(IdentityToken, StatusCode), Error> {
+    let secret = app
+        .setup()
+        .initial(&request.name, &request.password, &setup_at)
+        .await
+        .map_err(Error)?;
+    let identity = identity.set(secret);
+    Ok((identity, StatusCode::NO_CONTENT))
+}
+
+#[derive(serde::Deserialize)]
+pub struct Request {
+    pub name: String,
+    pub password: Password,
+}
+
+#[derive(Debug)]
+pub struct Error(pub app::Error);
+
+impl IntoResponse for Error {
+    fn into_response(self) -> Response {
+        let Self(error) = self;
+        match error {
+            app::Error::SetupCompleted => (StatusCode::CONFLICT, error.to_string()).into_response(),
+            other => Internal::from(other).into_response(),
+        }
+    }
+}
-- 
cgit v1.2.3