Add fallback handlers for 404 and 405

3 files changed, 26 insertions, 1 deletions

diff --git a/src/error/client.rs b/src/error/client.rs
index e93bbb7..9b2c89b 100644
--- a/src/error/client.rs
+++ b/src/error/client.rs
@@ -1,4 +1,6 @@
 pub enum ClientError {
+    NotFound { path: String },
+    MethodNotAllowed { path: String },
     BadJsonBody(String),
     BadQueryString(String),
     BadAuthTokenHeader(String),
@@ -13,6 +15,8 @@ pub enum ClientError {
 impl ClientError {
     pub fn kind(&self) -> String {
         match self {
+            Self::NotFound { .. } => "NotFound",
+            Self::MethodNotAllowed { .. } => "MethodNotAllowed",
             Self::BadJsonBody(..) => "BadJsonBody",
             Self::BadQueryString(..) => "BadQueryString",
             Self::BadAuthTokenHeader(..) => "BadAuthTokenHeader",
@@ -28,6 +32,10 @@ impl ClientError {
 
     pub fn into_message(self) -> String {
         match self {
+            Self::NotFound { path } => format!("endpoint `{}` not found", path),
+            Self::MethodNotAllowed { path } => {
+                format!("endpoint `{}` doesn't support this method", path)
+            }
             Self::BadJsonBody(msg) => msg,
             Self::BadQueryString(msg) => msg,
             Self::BadAuthTokenHeader(msg) => msg,
diff --git a/src/main.rs b/src/main.rs
index 560225e..4541646 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -38,6 +38,8 @@ async fn router() -> Router {
         .layer(TraceLayer::new_for_http())
         .with_state(AppState { db, secret })
         .merge(Scalar::with_url("/docs", api))
+        .fallback(routers::not_found)
+        .method_not_allowed_fallback(routers::method_not_allowed)
 }
 
 #[tokio::main]
diff --git a/src/routers/mod.rs b/src/routers/mod.rs
index b7bc1e6..f9ec049 100644
--- a/src/routers/mod.rs
+++ b/src/routers/mod.rs
@@ -1,10 +1,25 @@
 mod account;
 mod queue;
 
+use axum::extract::OriginalUri;
 use utoipa::OpenApi;
 use utoipa_axum::router::OpenApiRouter;
 
-use crate::{AppOpenApi, AppState};
+use crate::{AppOpenApi, AppState, ClientError, ErrorResponse};
+
+pub async fn not_found(OriginalUri(path): OriginalUri) -> ErrorResponse {
+    ClientError::NotFound {
+        path: path.to_string(),
+    }
+    .into()
+}
+
+pub async fn method_not_allowed(OriginalUri(path): OriginalUri) -> ErrorResponse {
+    ClientError::MethodNotAllowed {
+        path: path.to_string(),
+    }
+    .into()
+}
 
 pub fn router() -> OpenApiRouter<AppState> {
     OpenApiRouter::with_openapi(AppOpenApi::openapi())