diff --git a/Cargo.lock b/Cargo.lock index 18c1eae..ee9e090 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -140,36 +140,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "axum" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9f346c92c1e9a71d14fe4aaf7c2a5d9932cc4e5e48d8fb6641524416eb79ddd" -dependencies = [ - "async-trait", - "axum-core 0.1.2", - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "hyper", - "matchit 0.4.6", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-http", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.5.1" @@ -177,7 +147,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47594e438a243791dba58124b6669561f5baa14cb12046641d8008bf035e5a25" dependencies = [ "async-trait", - "axum-core 0.2.1", + "axum-core", "bitflags", "bytes", "futures-util", @@ -186,7 +156,7 @@ dependencies = [ "http-body", "hyper", "itoa 1.0.1", - "matchit 0.5.0", + "matchit", "memchr", "mime", "multer", @@ -203,20 +173,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbcda393bef9c87572779cb8ef916f12d77750b27535dd6819fa86591627a51" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "mime", -] - [[package]] name = "axum-core" version = "0.2.1" @@ -1214,12 +1170,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "matchit" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9376a4f0340565ad675d11fc1419227faf5f60cd7ac9cb2e7185a471f30af833" - [[package]] name = "matchit" version = "0.5.0" @@ -1283,7 +1233,7 @@ name = "mixini-server" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.5.1", + "axum", "chrono", "dotenv", "entity", @@ -1529,11 +1479,11 @@ dependencies = [ [[package]] name = "oxide-auth-axum" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a2c212cb892be726806c90474b559dcf1d80743a814879bd010d3490a10921" +checksum = "6ec530f450c00cb8d7b41ca65da81674f416afba1f54b53b74b4f1f6a93a7583" dependencies = [ - "axum 0.4.8", + "axum", "oxide-auth", ] @@ -1946,7 +1896,7 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "sea-orm" version = "0.7.1" -source = "git+https://github.com/fairingrey/sea-orm?branch=changeset-like#654e1411237bf55c9de733dd463047a06f26f1a7" +source = "git+https://github.com/fairingrey/sea-orm?branch=changeset-like#64d63cb69ecd320a4335fce4654ab77c922d4d98" dependencies = [ "async-stream", "async-trait", @@ -1971,7 +1921,7 @@ dependencies = [ [[package]] name = "sea-orm-macros" version = "0.7.0" -source = "git+https://github.com/fairingrey/sea-orm?branch=changeset-like#654e1411237bf55c9de733dd463047a06f26f1a7" +source = "git+https://github.com/fairingrey/sea-orm?branch=changeset-like#64d63cb69ecd320a4335fce4654ab77c922d4d98" dependencies = [ "bae", "heck", @@ -2720,9 +2670,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "80b9fa4360528139bc96100c160b7ae879f5567f49f1782b0b02035b0358ebf3" dependencies = [ "cfg-if", "log", @@ -2765,9 +2715,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9df98b037d039d03400d9dd06b0f8ce05486b5f25e9a2d7d36196e142ebbc52" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index f450fba..2e289d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ oso = { version = "0.26.0", features = [ "uuid-07", ] } oxide-auth = "0.5.1" -oxide-auth-axum = "0.1.0" +oxide-auth-axum = "0.2.0" rand = "0.8.5" redis = { version = "0.21.5", features = [ "aio", @@ -52,8 +52,8 @@ tower-http = { version = "0.2.5", features = [ "trace", "cors", ] } -tracing = "0.1.32" -tracing-subscriber = { version = "0.3.10", features = ["env-filter"] } +tracing = "0.1.33" +tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } ulid = { version = "0.5.0", features = ["serde", "uuid"] } uuid = { version = "0.8.2", features = ["serde", "v4"] } validator = { version = "0.14.0", features = ["derive"] }