diff --git a/Cargo.lock b/Cargo.lock index de7f349..f9f23b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ version = "6.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a665c228a226506796fca6de90cf1ad477157513ee15d6327bf810d5a3a98f72" dependencies = [ - "async-graphql-derive", - "async-graphql-parser", - "async-graphql-value", + "async-graphql-derive 6.0.10", + "async-graphql-parser 6.0.10", + "async-graphql-value 6.0.10", "async-stream", "async-trait", "base64 0.13.1", @@ -128,11 +128,11 @@ dependencies = [ "futures-timer", "futures-util", "handlebars", - "http", + "http 0.2.9", "indexmap", "lru", "mime", - "multer", + "multer 2.1.0", "num-traits", "once_cell", "pin-project-lite", @@ -145,15 +145,45 @@ dependencies = [ "thiserror", ] +[[package]] +name = "async-graphql" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba89a35adbed833e0d21db467093a087c3a07b497626009eae02cb36f060567" +dependencies = [ + "async-graphql-derive 7.0.2", + "async-graphql-parser 7.0.2", + "async-graphql-value 7.0.2", + "async-stream", + "async-trait", + "base64 0.21.5", + "bytes", + "fnv", + "futures-util", + "http 1.0.0", + "indexmap", + "mime", + "multer 3.0.0", + "num-traits", + "once_cell", + "pin-project-lite", + "regex", + "serde", + "serde_json", + "serde_urlencoded", + "static_assertions_next", + "thiserror", +] + [[package]] name = "async-graphql-axum" -version = "6.0.10" +version = "7.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0f743cae5a878edf00b6aa59479241310e9341345262e952e9c9e071eb3384" +checksum = "74cb0d91622015797c94dbb862580ba5e89bfd4b9066ad7d8d9ac8e1ca5ab6f8" dependencies = [ - "async-graphql", + "async-graphql 7.0.2", "async-trait", - "axum", + "axum 0.7.4", "bytes", "futures-util", "serde_json", @@ -170,7 +200,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2f04964faf9ad71289d4c51b3b43a7b9c01c23c16d9c52bca48161ba8a3cbc3" dependencies = [ "Inflector", - "async-graphql-parser", + "async-graphql-parser 6.0.10", + "darling", + "proc-macro-crate", + "proc-macro2", + "quote", + "strum", + "syn 2.0.39", + "thiserror", +] + +[[package]] +name = "async-graphql-derive" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9547f7f22688f022ea8001bdd57a1fce8996045dcb959b1730a79bafd366a9d9" +dependencies = [ + "Inflector", + "async-graphql-parser 7.0.2", "darling", "proc-macro-crate", "proc-macro2", @@ -186,7 +233,19 @@ version = "6.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "786a2329756a9946d83106e389a977a808ab22628cb797c1afcf174fd01c40d5" dependencies = [ - "async-graphql-value", + "async-graphql-value 6.0.10", + "pest", + "serde", + "serde_json", +] + +[[package]] +name = "async-graphql-parser" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8e3d4cc5074c46adfee619b5b6cf817943332f772ed5930ed78871f7dbbac6" +dependencies = [ + "async-graphql-value 7.0.2", "pest", "serde", "serde_json", @@ -204,6 +263,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "async-graphql-value" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53ff1287a1283ea772b4099dd556ba4577d35f069ea4a93f337a525beefcfacf" +dependencies = [ + "bytes", + "indexmap", + "serde", + "serde_json", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -274,15 +345,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", - "base64 0.21.5", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", - "headers", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.27", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +dependencies = [ + "async-trait", + "axum-core 0.4.3", + "base64 0.21.5", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", "itoa", "matchit", "memchr", @@ -297,10 +400,11 @@ dependencies = [ "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -312,14 +416,35 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "backtrace" version = "0.3.69" @@ -440,9 +565,9 @@ name = "caster-api" version = "0.1.0" dependencies = [ "anyhow", - "async-graphql", + "async-graphql 6.0.10", "async-graphql-axum", - "axum", + "axum 0.6.20", "biscuit", "caster-auth", "caster-domains", @@ -452,7 +577,7 @@ dependencies = [ "fake", "futures", "futures-util", - "hyper", + "hyper 0.14.27", "hyper-tls", "log", "mockall", @@ -467,7 +592,7 @@ dependencies = [ "sqlx", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tower-http", "tracing", "tracing-subscriber", @@ -481,12 +606,12 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "axum", + "axum 0.6.20", "biscuit", "caster-utils", "fake", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.27", "hyper-tls", "jsonwebtoken", "log", @@ -505,14 +630,14 @@ name = "caster-domains" version = "0.1.0" dependencies = [ "anyhow", - "async-graphql", + "async-graphql 6.0.10", "async-trait", "caster-auth", "caster-testing", "caster-utils", "chrono", "fake", - "hyper", + "hyper 0.14.27", "maplit", "mockall", "oso", @@ -533,7 +658,7 @@ version = "0.1.0" dependencies = [ "anyhow", "caster-utils", - "hyper", + "hyper 0.14.27", "hyper-tls", "mockall", "oso", @@ -548,12 +673,12 @@ name = "caster-utils" version = "0.1.0" dependencies = [ "anyhow", - "async-graphql", - "async-graphql-parser", + "async-graphql 6.0.10", + "async-graphql-parser 6.0.10", "async-trait", "fake", "figment", - "hyper", + "hyper 0.14.27", "hyper-tls", "once_cell", "rand", @@ -891,7 +1016,7 @@ dependencies = [ "chrono", "deunicode", "dummy", - "http", + "http 0.2.9", "rand", "url-escape", "uuid", @@ -1127,6 +1252,25 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "handlebars" version = "4.4.0" @@ -1169,30 +1313,6 @@ dependencies = [ "hashbrown 0.14.2", ] -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.5", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", -] - [[package]] name = "heck" version = "0.4.1" @@ -1252,6 +1372,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -1259,7 +1390,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1291,8 +1445,8 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1304,6 +1458,25 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -1311,12 +1484,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", +] + [[package]] name = "iana-time-zone" version = "0.1.58" @@ -1666,7 +1855,25 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.9", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + +[[package]] +name = "multer" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http 1.0.0", "httparse", "log", "memchr", @@ -3016,6 +3223,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + [[package]] name = "string_cache" version = "0.8.7" @@ -3288,7 +3501,19 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.21.0", ] [[package]] @@ -3303,6 +3528,7 @@ dependencies = [ "futures-sink", "pin-project-lite", "tokio", + "tracing", ] [[package]] @@ -3376,8 +3602,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "pin-project-lite", "tower-layer", @@ -3474,7 +3700,26 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.9", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 1.0.0", "httparse", "log", "rand", diff --git a/apps/api/Cargo.toml b/apps/api/Cargo.toml index 7c77b6d..9ead202 100644 --- a/apps/api/Cargo.toml +++ b/apps/api/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] anyhow = "1.0" async-graphql = { version = "6.0", features = ["chrono"] } -async-graphql-axum = "6.0" +async-graphql-axum = "7.0" axum = "0.6" biscuit = "0.6.0-beta1" caster-auth = { path = "../../libs/auth" }