Update Rocket Starwars and add Rocket Upload

Cargo.toml

@@ -25,4 +25,5 @@ members = [
     "tide/subscription",
 
     "rocket/starwars",
+    "rocket/upload",
 ]

rocket/starwars/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Daniel Wiesenberg <daniel@simplificAR.io>"]
 edition = "2018"
 
 [dependencies]
-async-graphql = { path = "../../..", version = "2.0.3" }
-async-graphql-rocket = { path = "../../../integrations/rocket", version = "2.0.3" }
-rocket = { git = "https://github.com/SergioBenitez/Rocket/", rev = "2893ce7", default-features = false } # TODO: Change to Cargo crate when Rocket 0.5.0 is released
+async-graphql = { path = "../../.." }
+async-graphql-rocket = { path = "../../../integrations/rocket" }
+rocket = { git = "https://github.com/SergioBenitez/Rocket/", rev = "fa3e033", default-features = false } # TODO: Change to Cargo crate when Rocket 0.5.0 is released
 starwars = { path = "../../models/starwars" }

rocket/starwars/Rocket.toml

@@ -2,22 +2,22 @@
 [global.limits]
 graphql = 131072
 
-[development]
-address = "localhost"
+[debug]
+address = "127.0.0.1"
 port = 8000
 keep_alive = 5
-log = "normal"
+log_level = "normal"
 
 
 [staging]
 address = "0.0.0.0"
 port = 8080
 keep_alive = 5
-log = "normal"
+log_level = "normal"
 
 
-[production]
+[release]
 address = "0.0.0.0"
 port = 8080
 keep_alive = 5
-log = "critical"
+log_level = "critical"

rocket/starwars/src/main.rs

@@ -14,22 +14,22 @@ fn graphql_playground() -> content::Html<String> {
 }
 
 #[rocket::get("/graphql?<query..>")]
-async fn graphql_query(schema: State<'_, StarWarsSchema>, query: Query) -> Response {
-    query.execute(&schema).await
+async fn graphql_query(schema: &State<StarWarsSchema>, query: Query) -> Response {
+    query.execute(schema).await
 }
 
 #[rocket::post("/graphql", data = "<request>", format = "application/json")]
-async fn graphql_request(schema: State<'_, StarWarsSchema>, request: Request) -> Response {
-    request.execute(&schema).await
+async fn graphql_request(schema: &State<StarWarsSchema>, request: Request) -> Response {
+    request.execute(schema).await
 }
 
 #[rocket::launch]
-fn rocket() -> rocket::Rocket {
+fn rocket() -> _ {
     let schema = Schema::build(QueryRoot, EmptyMutation, EmptySubscription)
         .data(StarWars::new())
         .finish();
 
-    rocket::ignite().manage(schema).mount(
+    rocket::build().manage(schema).mount(
         "/",
         routes![graphql_query, graphql_request, graphql_playground],
     )

rocket/upload/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "rocket-upload"
+version = "0.1.1"
+authors = ["Daniel Wiesenberg <daniel@simplificAR.io>"]
+edition = "2018"
+
+[dependencies]
+async-graphql = { path = "../../.." }
+async-graphql-rocket = { path = "../../../integrations/rocket" }
+rocket = { git = "https://github.com/SergioBenitez/Rocket/", rev = "fa3e033", default-features = false } # TODO: Change to Cargo crate when Rocket 0.5.0 is released
+files = { path = "../../models/files" }

rocket/upload/Rocket.toml

@@ -0,0 +1,23 @@
+# For more information take a look at https://rocket.rs/guide/configuration/
+[global.limits]
+graphql = 131072
+
+[debug]
+address = "127.0.0.1"
+port = 8000
+keep_alive = 5
+log_level = "normal"
+
+
+[staging]
+address = "0.0.0.0"
+port = 8080
+keep_alive = 5
+log_level = "normal"
+
+
+[release]
+address = "0.0.0.0"
+port = 8080
+keep_alive = 5
+log_level = "critical"

rocket/upload/src/main.rs

@@ -0,0 +1,41 @@
+use async_graphql::{
+    http::{playground_source, GraphQLPlaygroundConfig},
+    EmptyMutation, EmptySubscription, Schema,
+};
+use async_graphql_rocket::{Query, Request, Response};
+use rocket::{response::content, routes, State};
+use files::{FilesSchema, MutationRoot, QueryRoot, Storage};
+
+pub type StarWarsSchema = Schema<QueryRoot, EmptyMutation, EmptySubscription>;
+
+#[rocket::get("/")]
+fn graphql_playground() -> content::Html<String> {
+    content::Html(playground_source(GraphQLPlaygroundConfig::new("/graphql")))
+}
+
+#[rocket::get("/graphql?<query..>")]
+async fn graphql_query(schema: &State<FilesSchema>, query: Query) -> Response {
+    query.execute(schema).await
+}
+
+#[rocket::post("/graphql", data = "<request>", format = "application/json", rank = 1)]
+async fn graphql_request(schema: &State<FilesSchema>, request: Request) -> Response {
+    request.execute(schema).await
+}
+
+#[rocket::post("/graphql", data = "<request>", format = "multipart/form-data", rank = 2)]
+async fn graphql_request_multipart(schema: &State<FilesSchema>, request: Request) -> Response {
+    request.execute(schema).await
+}
+
+#[rocket::launch]
+fn rocket() -> _ {
+    let schema = Schema::build(QueryRoot, MutationRoot, EmptySubscription)
+        .data(Storage::default())
+        .finish();
+
+    rocket::build().manage(schema).mount(
+        "/",
+        routes![graphql_query, graphql_request, graphql_request_multipart, graphql_playground],
+    )
+}