Update Rocket v0.5 (#825)

* Update rocket-todo to rocket-v0.5.0 * Update rocket versions to v0.5 * Update rocket version in README and comment to v0.5 --------- Co-authored-by: yuk1ty <yuk1ty@users.noreply.github.com>
juhaku · Jan 1, 2024 · d437919 · d437919
1 parent 3e5a635
commit d437919
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Refer to the existing [examples](./examples) for building the "todo" app in the
 - **[axum](https://github.com/tokio-rs/axum)**
 - **[warp](https://github.com/seanmonstar/warp)**
 - **[tide](https://github.com/http-rs/tide)**
-- **[rocket](https://github.com/SergioBenitez/Rocket)** (`0.4` and `0.5.0-rc3`)
+- **[rocket](https://github.com/SergioBenitez/Rocket)** (`0.4` and `0.5`)
 
 All examples include a [Swagger-UI](https://github.com/swagger-api/swagger-ui) unless stated otherwise.
 

diff --git a/examples/rocket-todo/Cargo.toml b/examples/rocket-todo/Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Elli Example <example@example.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rocket = { version = "0.5.0-rc.3", features = ["json"] }
+rocket = { version = "0.5", features = ["json"] }
 utoipa = { path = "../../utoipa", features = ["rocket_extras"] }
 utoipa-swagger-ui = { path = "../../utoipa-swagger-ui", features = ["rocket"] }
 utoipa-redoc = { path = "../../utoipa-redoc", features = ["rocket"] }

diff --git a/examples/rocket-todo/src/main.rs b/examples/rocket-todo/src/main.rs
@@ -55,10 +55,7 @@ fn rocket() -> Rocket<Build> {
         )
         // There is no need to create RapiDoc::with_openapi because the OpenApi is served
         // via SwaggerUi instead we only make rapidoc to point to the existing doc.
-        .mount(
-            "/",
-            RapiDoc::new("/api-docs/openapi.json").path("/rapidoc")
-        )
+        .mount("/", RapiDoc::new("/api-docs/openapi.json").path("/rapidoc"))
         // Alternative to above
         // .mount(
         //     "/",
@@ -127,11 +124,11 @@ mod todo {
         async fn from_request(request: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
             match request.headers().get("todo_apikey").next() {
                 Some(key) if key == "utoipa-rocks" => Outcome::Success(RequireApiKey),
-                None => Outcome::Failure((
+                None => Outcome::Error((
                     Status::Unauthorized,
                     TodoError::Unauthorized(String::from("missing api key")),
                 )),
-                _ => Outcome::Failure((
+                _ => Outcome::Error((
                     Status::Unauthorized,
                     TodoError::Unauthorized(String::from("invalid api key")),
                 )),
@@ -153,7 +150,7 @@ mod todo {
                 }
                 _ => {
                     log::info!("no api key");
-                    Outcome::Forward(())
+                    Outcome::Forward(Status::Unauthorized)
                 }
             }
         }

diff --git a/utoipa-gen/Cargo.toml b/utoipa-gen/Cargo.toml
@@ -29,7 +29,7 @@ serde = "1"
 actix-web = { version = "4", features = ["macros"], default-features = false }
 axum = "0.7"
 paste = "1"
-rocket = { version = "0.5.0-rc.3", features = ["json"] }
+rocket = { version = "0.5", features = ["json"] }
 smallvec = { version = "1.10", features = ["serde"] }
 rust_decimal = "1"
 chrono = { version = "0.4", features = ["serde"] }

diff --git a/utoipa-rapidoc/Cargo.toml b/utoipa-rapidoc/Cargo.toml
@@ -19,5 +19,5 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 utoipa = { version = "4", path = "../utoipa" }
 actix-web = { version = "4", optional = true, default-features = false }
-rocket = { version = "0.5.0-rc.3", features = ["json"], optional = true }
+rocket = { version = "0.5", features = ["json"], optional = true }
 axum = { version = "0.7", optional = true }
diff --git a/utoipa-rapidoc/README.md b/utoipa-rapidoc/README.md
@@ -16,7 +16,7 @@ You may find fullsize examples from utoipa's Github [repository][examples].
 # Crate Features
 
 * **actix-web** Allows serving `RapiDoc` via _**`actix-web`**_. `version >= 4`
-* **rocket** Allows serving `RapiDoc` via _**`rocket`**_. `version >=0.5.0-rc.3`
+* **rocket** Allows serving `RapiDoc` via _**`rocket`**_. `version >=0.5`
 * **axum** Allows serving `RapiDoc` via _**`axum`**_. `version >=0.7`
 
 # Install

diff --git a/utoipa-redoc/Cargo.toml b/utoipa-redoc/Cargo.toml
@@ -19,5 +19,5 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 utoipa = { version = "4", path = "../utoipa" }
 actix-web = { version = "4", optional = true, default-features = false }
-rocket = { version = "0.5.0-rc.3", features = ["json"], optional = true }
+rocket = { version = "0.5", features = ["json"], optional = true }
 axum = { version = "0.7", optional = true }
diff --git a/utoipa-redoc/README.md b/utoipa-redoc/README.md
@@ -16,7 +16,7 @@ You may find fullsize examples from utoipa's Github [repository][examples].
 # Crate Features
 
 * **actix-web** Allows serving `Redoc` via _**`actix-web`**_. `version >= 4`
-* **rocket** Allows serving `Redoc` via _**`rocket`**_. `version >=0.5.0-rc.3`
+* **rocket** Allows serving `Redoc` via _**`rocket`**_. `version >=0.5`
 * **axum** Allows serving `Redoc` via _**`axum`**_. `version >=0.7`
 
 # Install

diff --git a/utoipa-swagger-ui/Cargo.toml b/utoipa-swagger-ui/Cargo.toml
@@ -18,7 +18,7 @@ debug-embed = ["rust-embed/debug-embed"]
 rust-embed = { version = "8" }
 mime_guess = { version = "2.0" }
 actix-web = { version = "4", optional = true, default-features = false }
-rocket = { version = "0.5.0-rc.3", features = ["json"], optional = true }
+rocket = { version = "0.5", features = ["json"], optional = true }
 axum = { version = "0.7", optional = true }
 utoipa = { version = "4", path = "../utoipa" }
 serde = { version = "1.0", features = ["derive"] }

diff --git a/utoipa-swagger-ui/README.md b/utoipa-swagger-ui/README.md
@@ -12,7 +12,7 @@ works as a bridge for serving the OpenAPI documentation created with
 **Currently implemented boilerplate for:**
 
 * **actix-web** `version >= 4`
-* **rocket** `version >=0.5.0-rc.3`
+* **rocket** `version >=0.5`
 * **axum** `version >=0.7`
 
 Serving Swagger UI is framework independent thus this crate also supports serving the Swagger UI with

diff --git a/utoipa-swagger-ui/src/lib.rs b/utoipa-swagger-ui/src/lib.rs
@@ -8,7 +8,7 @@
 //! **Currently implemented boiler plate for:**
 //!
 //! * **actix-web** `version >= 4`
-//! * **rocket** `version >=0.5.0-rc.3`
+//! * **rocket** `version >=0.5`
 //! * **axum** `version >=0.6`
 //!
 //! Serving Swagger UI is framework independent thus this crate also supports serving the Swagger UI with