Upgrade to main Rocket (#918)

levkk · web-flow · commit c2dca1a366a1 · 2023-08-14T18:23:50.000-07:00
diff --git a/pgml-dashboard/Cargo.lock b/pgml-dashboard/Cargo.lock
diff --git a/pgml-dashboard/Cargo.toml b/pgml-dashboard/Cargo.toml
@@ -27,7 +27,7 @@ num-traits = "0.2"
 once_cell = "1.18"
 rand = "0.8"
 regex = "1.9"
-rocket = {version = "0.5.0-rc.3", features = ["secrets"] }
+rocket = { git = "https://github.com/SergioBenitez/Rocket", features = ["secrets"] }
 sailfish = "0.5"
 scraper = "0.17"
 serde = "1"
diff --git a/pgml-dashboard/src/guards.rs b/pgml-dashboard/src/guards.rs
@@ -2,6 +2,7 @@ use std::env::var;
 
 use crate::templates::components::{StaticNav, StaticNavLink};
 use rocket::request::{self, FromRequest, Request};
+use rocket::http::Status;
 use sqlx::{postgres::PgPoolOptions, Executor, PgPool};
 
 use crate::models;
@@ -92,13 +93,13 @@ impl<'r> FromRequest<'r> for ConnectedCluster<'r> {
     async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
         let cluster = match request.guard::<&Cluster>().await {
             request::Outcome::Success(cluster) => cluster,
-            _ => return request::Outcome::Forward(()),
+            _ => return request::Outcome::Forward(Status::NotFound),
         };
 
         if cluster.pool.as_ref().is_some() {
             request::Outcome::Success(ConnectedCluster { inner: cluster })
         } else {
-            request::Outcome::Forward(())
+            request::Outcome::Forward(Status::NotFound)
         }
     }
 }
