Update warp routes

- Update warp routes to have the path filter take precedence.
- Update problem unpack function to unpack 405 after everything else and
before 500.

Author: aslamplr

src/helpers/problem.rs

@@ -18,7 +18,7 @@ pub fn pack(err: anyhow::Error) -> Problem {
         match err {
             auth::AuthError::InvalidCredentials => {
                 return Problem::new("Invalid credentials.")
-                    .set_status(http::StatusCode::BAD_REQUEST)
+                    .set_status(http::StatusCode::UNAUTHORIZED)
                     .set_detail("The passed credentials were invalid.")
             }
             auth::AuthError::ArgonError => (),
@@ -60,17 +60,17 @@ pub async fn unpack(rejection: Rejection) -> Result<impl Reply, Infallible> {
     let reply = if rejection.is_not_found() {
         let problem = Problem::with_title_and_type_from_status(http::StatusCode::NOT_FOUND);
         reply_from_problem(&problem)
-    } else if let Some(_) = rejection.find::<warp::reject::MethodNotAllowed>() {
-        let problem =
-            Problem::with_title_and_type_from_status(http::StatusCode::METHOD_NOT_ALLOWED);
-        reply_from_problem(&problem)
     } else if let Some(problem) = rejection.find::<Problem>() {
         reply_from_problem(problem)
     } else if let Some(e) = rejection.find::<warp::filters::body::BodyDeserializeError>() {
         let problem = Problem::new("Invalid Request Body.")
             .set_status(http::StatusCode::BAD_REQUEST)
             .set_detail(format!("Request body is invalid. {}", e));
         reply_from_problem(&problem)
+    } else if let Some(_) = rejection.find::<warp::reject::MethodNotAllowed>() {
+        let problem =
+            Problem::with_title_and_type_from_status(http::StatusCode::METHOD_NOT_ALLOWED);
+        reply_from_problem(&problem)
     } else {
         let problem =
             Problem::with_title_and_type_from_status(http::StatusCode::INTERNAL_SERVER_ERROR);

src/main.rs

@@ -61,12 +61,12 @@ async fn main() -> anyhow::Result<()> {
         .allow_any_origin()
         .build();
     let log = warp::log("api::request");
-    let status = warp::get()
-        .and(warp::path("status"))
+    let status = warp::path("status")
+        .and(warp::get())
         .and(warp::path::end())
         .map(|| format!("OK"));
-    let auth = warp::post()
-        .and(warp::path("auth"))
+    let auth = warp::path("auth")
+        .and(warp::post())
         .and(warp::path::end())
         .and(env.clone())
         .and(warp::body::json())
@@ -120,8 +120,8 @@ async fn main() -> anyhow::Result<()> {
 
         let coordinator = Arc::new(Coordinator::new(graphql::schema()));
 
-        let query = warp::post()
-            .and(warp::path("query"))
+        let query = warp::path("query")
+            .and(warp::post())
             .and(warp::path::end())
             .and(make_graphql_filter(graphql::schema(), context.clone()));