diff --git a/scheduler/Cargo.lock b/scheduler/Cargo.lock index 4327b695..1dc43f34 100644 --- a/scheduler/Cargo.lock +++ b/scheduler/Cargo.lock @@ -4,27 +4,28 @@ version = 3 [[package]] name = "actix-codec" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5dbeb2d9e51344cb83ca7cc170f1217f9fe25bfc50160e6e200b5c31c1019a" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "bytes", "futures-core", "futures-sink", - "log", + "memchr", "pin-project-lite", "tokio", "tokio-util", + "tracing", ] [[package]] name = "actix-cors" -version = "0.6.0-beta.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01552b8facccd5d7a4cc5d8e2b07d306160c97a4968181c2db965533389c8725" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" dependencies = [ - "actix-service", + "actix-utils", "actix-web", "derive_more", "futures-util", @@ -35,97 +36,93 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-beta.9" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01260589f1aafad11224002741eb37bc603b4ce55b4e3556d2b2122f9aac7c51" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" dependencies = [ "actix-codec", "actix-rt", "actix-service", - "actix-tls", "actix-utils", - "ahash 0.7.4", - "base64 0.13.0", - "bitflags 1.3.2", - "brotli2", + "ahash", + "base64 0.22.1", + "bitflags 2.6.0", + "brotli", "bytes", "bytestring", "derive_more", "encoding_rs", "flate2", "futures-core", - "futures-util", "h2", - "http", + "http 0.2.12", "httparse", - "itoa 0.4.8", + "httpdate", + "itoa 1.0.11", "language-tags", "local-channel", - "log", "mime", - "once_cell", "percent-encoding", - "pin-project", "pin-project-lite", "rand", - "regex", - "serde", - "sha-1", + "sha1", "smallvec", - "time 0.2.27", "tokio", + "tokio-util", + "tracing", "zstd", ] [[package]] name = "actix-macros" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f86cd6857c135e6e9fe57b1619a88d1f94a7df34c00e11fe13e64fd3438837" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "actix-router" -version = "0.2.7" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", - "http", - "log", + "cfg-if", + "http 0.2.12", "regex", + "regex-lite", "serde", + "tracing", ] [[package]] name = "actix-rt" -version = "2.2.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7d7cd957c9ed92288a7c3c96af81fa5291f65247a76a34dac7b6af74e52ba0" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" dependencies = [ - "actix-macros", "futures-core", "tokio", ] [[package]] name = "actix-server" -version = "2.0.0-beta.5" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26369215fcc3b0176018b3b68756a8bcc275bb000e6212e454944913a1f9bf87" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" dependencies = [ "actix-rt", "actix-service", "actix-utils", "futures-core", - "log", - "mio 0.7.13", - "num_cpus", - "slab", + "futures-util", + "mio", + "socket2 0.5.7", "tokio", + "tracing", ] [[package]] @@ -141,19 +138,21 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0-beta.5" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" dependencies = [ - "actix-codec", "actix-rt", "actix-service", "actix-utils", - "derive_more", "futures-core", - "http", - "log", + "http 0.2.12", + "http 1.1.0", + "impl-more", + "pin-project-lite", + "tokio", "tokio-util", + "tracing", ] [[package]] @@ -168,9 +167,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-beta.8" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c503f726f895e55dac39adeafd14b5ee00cc956796314e9227fc7ae2e176f443" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -181,41 +180,42 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.4", + "ahash", "bytes", + "bytestring", "cfg-if", "cookie", "derive_more", - "either", "encoding_rs", "futures-core", "futures-util", - "itoa 0.4.8", + "itoa 1.0.11", "language-tags", "log", "mime", "once_cell", - "paste", - "pin-project", + "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.1", - "time 0.2.27", + "socket2 0.5.7", + "time 0.3.36", "url", ] [[package]] name = "actix-web-codegen" -version = "0.5.0-beta.3" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d048c6986743105c1e8e9729fbc8d5d1667f2f62393a58be8d85a7d9a5a6c8d" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ + "actix-router", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -233,17 +233,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "ahash" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -266,6 +255,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "allocator-api2" version = "0.2.18" @@ -315,21 +319,26 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "3.0.0-beta.7" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364ef81705bf38403a3c3da4fab9eeec1e1503cd72dd6cd7c4259d2a6b08aa98" +checksum = "fe6b67e44fb95d1dc9467e3930383e115f9b4ed60ca689db41409284e967a12d" dependencies = [ "actix-codec", "actix-http", "actix-rt", "actix-service", - "base64 0.13.0", + "actix-tls", + "actix-utils", + "base64 0.22.1", "bytes", "cfg-if", "cookie", "derive_more", "futures-core", - "itoa 0.4.8", + "futures-util", + "h2", + "http 0.2.12", + "itoa 1.0.11", "log", "mime", "percent-encoding", @@ -338,6 +347,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "tokio", ] [[package]] @@ -355,12 +365,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.12.3" @@ -379,6 +383,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "base64ct" version = "1.6.0" @@ -400,15 +410,6 @@ dependencies = [ "serde", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -419,23 +420,24 @@ dependencies = [ ] [[package]] -name = "brotli-sys" -version = "0.3.2" +name = "brotli" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ - "cc", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "brotli2" -version = "0.3.2" +name = "brotli-decompressor" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ - "brotli-sys", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", ] [[package]] @@ -511,12 +513,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_fn" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" - [[package]] name = "convert_case" version = "0.4.0" @@ -525,12 +521,12 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "cookie" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.2.27", + "time 0.3.36", "version_check", ] @@ -624,6 +620,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derive_more" version = "0.99.16" @@ -633,37 +638,22 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.3.3", + "rustc_version", "syn 1.0.109", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dotenvy" version = "0.15.7" @@ -920,36 +910,30 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "h2" -version = "0.3.4" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.7.0", + "http 0.2.12", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", ] @@ -959,7 +943,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -971,15 +955,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hex" version = "0.4.3" @@ -1001,7 +976,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -1015,13 +990,24 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 0.4.8", + "itoa 1.0.11", +] + +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.11", ] [[package]] @@ -1031,7 +1017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" dependencies = [ "bytes", - "http", + "http 0.2.12", "pin-project-lite", ] @@ -1058,7 +1044,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "http-body", "httparse", "httpdate", @@ -1096,14 +1082,10 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "1.7.0" +name = "impl-more" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown 0.11.2", -] +checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "indexmap" @@ -1112,7 +1094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1282,7 +1264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest 0.10.7", + "digest", ] [[package]] @@ -1322,19 +1304,6 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - [[package]] name = "mio" version = "0.8.11" @@ -1342,18 +1311,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] [[package]] -name = "miow" -version = "0.3.7" +name = "mutually_exclusive_features" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] +checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e" [[package]] name = "native-tls" @@ -1439,7 +1406,7 @@ dependencies = [ "serde", "thiserror", "url", - "uuid 1.9.1", + "uuid", ] [[package]] @@ -1459,7 +1426,7 @@ dependencies = [ "sqlx", "tokio", "tracing", - "uuid 1.9.1", + "uuid", ] [[package]] @@ -1490,15 +1457,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -1527,6 +1485,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.44" @@ -1558,16 +1522,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.32.2" @@ -1583,12 +1537,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.36" @@ -1780,16 +1728,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] -name = "ppv-lite86" -version = "0.2.10" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "proc-macro-hack" -version = "0.5.19" +name = "ppv-lite86" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "proc-macro2" @@ -1878,9 +1826,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -1896,6 +1844,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" + [[package]] name = "regex-syntax" version = "0.6.25" @@ -1913,7 +1867,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "http", + "http 0.2.12", "http-body", "hyper", "hyper-tls", @@ -1972,7 +1926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", - "digest 0.10.7", + "digest", "num-bigint-dig", "num-integer", "num-traits", @@ -1991,22 +1945,13 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" dependencies = [ - "semver 0.11.0", + "semver", ] [[package]] @@ -2067,30 +2012,15 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser 0.7.0", -] - [[package]] name = "semver" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "semver-parser" version = "0.10.2" @@ -2165,25 +2095,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - [[package]] name = "sha1" version = "0.10.6" @@ -2192,7 +2103,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -2203,7 +2114,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -2230,7 +2141,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", + "digest", "rand_core", ] @@ -2331,7 +2242,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ - "ahash 0.8.11", + "ahash", "atoi", "byteorder", "bytes", @@ -2346,7 +2257,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.2.6", + "indexmap", "log", "memchr", "once_cell", @@ -2362,7 +2273,7 @@ dependencies = [ "tokio-stream", "tracing", "url", - "uuid 1.9.1", + "uuid", ] [[package]] @@ -2416,7 +2327,7 @@ dependencies = [ "byteorder", "bytes", "crc", - "digest 0.10.7", + "digest", "dotenvy", "either", "futures-channel", @@ -2436,14 +2347,14 @@ dependencies = [ "rand", "rsa", "serde", - "sha1 0.10.6", + "sha1", "sha2", "smallvec", "sqlx-core", "stringprep", "thiserror", "tracing", - "uuid 1.9.1", + "uuid", "whoami", ] @@ -2482,7 +2393,7 @@ dependencies = [ "stringprep", "thiserror", "tracing", - "uuid 1.9.1", + "uuid", "whoami", ] @@ -2507,67 +2418,9 @@ dependencies = [ "tracing", "url", "urlencoding", - "uuid 1.9.1", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1 0.6.0", - "syn 1.0.109", + "uuid", ] -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stringprep" version = "0.1.2" @@ -2660,40 +2513,33 @@ dependencies = [ [[package]] name = "time" -version = "0.2.27" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", + "deranged", + "itoa 1.0.11", + "num-conv", + "powerfmt", + "serde", + "time-core", "time-macros", - "version_check", - "winapi", ] [[package]] -name = "time-macros" -version = "0.1.1" +name = "time-core" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] -name = "time-macros-impl" -version = "0.1.2" +name = "time-macros" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn 1.0.109", + "num-conv", + "time-core", ] [[package]] @@ -2720,7 +2566,7 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.11", + "mio", "parking_lot 0.12.3", "pin-project-lite", "signal-hook-registry", @@ -2763,14 +2609,13 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", ] @@ -2795,15 +2640,15 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.4.0-beta.11" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e529f2e4537b0f71c6bb734489680f780fcb97b7419b5500565714a641a250" +checksum = "4ee9e39a66d9b615644893ffc1704d2a89b5b315b7fd0228ad3182ca9a306b19" dependencies = [ "actix-web", - "futures", + "mutually_exclusive_features", + "pin-project", "tracing", - "tracing-futures", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -2972,15 +2817,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", -] - [[package]] name = "uuid" version = "1.9.1" @@ -3323,29 +3159,28 @@ checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zstd" -version = "0.7.0+zstd.1.4.9" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428752481d8372e15b1bf779ea518a179ad6c771cca2d2c60e4fbff3cc2cd52" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.1.0+zstd.1.4.9" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa1926623ad7fe406e090555387daf73db555b948134b4d73eac5eb08fb666d" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "1.5.0+zstd.1.4.9" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/scheduler/Cargo.toml b/scheduler/Cargo.toml index 01259e3f..1739ca64 100644 --- a/scheduler/Cargo.toml +++ b/scheduler/Cargo.toml @@ -21,9 +21,12 @@ members = [ nettu_scheduler_api = { path = "./crates/api" } nettu_scheduler_domain = { path = "./crates/domain" } nettu_scheduler_infra = { path = "./crates/infra" } -actix-web = "4.0.0-beta.8" +actix-web = "4.8" tracing = "0.1.19" -tracing-subscriber = { version = "0.2.12", features = ["registry", "env-filter"] } +tracing-subscriber = { version = "0.2.12", features = [ + "registry", + "env-filter", +] } tracing-bunyan-formatter = "0.2.4" tracing-log = "0.1.1" openssl-probe = "0.1.2" diff --git a/scheduler/crates/api/Cargo.toml b/scheduler/crates/api/Cargo.toml index bbdc2564..14abd4fd 100644 --- a/scheduler/crates/api/Cargo.toml +++ b/scheduler/crates/api/Cargo.toml @@ -12,19 +12,19 @@ nettu_scheduler_domain = { path = "../domain" } nettu_scheduler_infra = { path = "../infra" } serde = { version = "1.0", features = ["derive"] } futures = "0.3" -actix-web = "4.0.0-beta.8" -actix-cors = "0.6.0-beta.2" -awc = "3.0.0-beta.7" +actix-web = "4.8" +actix-cors = "0.7" +awc = "3.5" async-trait = "0.1.42" -rrule="0.5.8" +rrule = "0.5.8" chrono = { version = "0.4.19", features = ["serde"] } chrono-tz = "0.5.3" anyhow = "1.0.0" jsonwebtoken = "7" thiserror = "1.0" tracing = "0.1.25" -tracing-actix-web = "0.4.0-beta.10" +tracing-actix-web = "0.7.11" tracing-futures = "0.2.5" [dev-dependencies] -serial_test = "*" \ No newline at end of file +serial_test = "*" diff --git a/scheduler/crates/api/src/account/add_account_integration.rs b/scheduler/crates/api/src/account/add_account_integration.rs index 73ecea15..a8426992 100644 --- a/scheduler/crates/api/src/account/add_account_integration.rs +++ b/scheduler/crates/api/src/account/add_account_integration.rs @@ -1,12 +1,12 @@ use crate::shared::usecase::{execute, UseCase}; use crate::{error::NettuError, shared::auth::protect_account_route}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::add_account_integration::{APIResponse, RequestBody}; use nettu_scheduler_domain::{Account, AccountIntegration, IntegrationProvider}; use nettu_scheduler_infra::NettuContext; pub async fn add_account_integration_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, body: web::Json, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/account/delete_account_webhook.rs b/scheduler/crates/api/src/account/delete_account_webhook.rs index 51ad7c01..251dc6ca 100644 --- a/scheduler/crates/api/src/account/delete_account_webhook.rs +++ b/scheduler/crates/api/src/account/delete_account_webhook.rs @@ -2,12 +2,12 @@ use super::set_account_webhook::SetAccountWebhookUseCase; use crate::error::NettuError; use crate::shared::auth::protect_account_route; use crate::shared::usecase::execute; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::delete_account_webhook::APIResponse; use nettu_scheduler_infra::NettuContext; pub async fn delete_account_webhook_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, ) -> Result { let account = protect_account_route(&http_req, &ctx).await?; diff --git a/scheduler/crates/api/src/account/get_account.rs b/scheduler/crates/api/src/account/get_account.rs index ebe2da98..075f894a 100644 --- a/scheduler/crates/api/src/account/get_account.rs +++ b/scheduler/crates/api/src/account/get_account.rs @@ -1,11 +1,11 @@ use crate::error::NettuError; use crate::shared::auth::protect_account_route; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::get_account::APIResponse; use nettu_scheduler_infra::NettuContext; pub async fn get_account_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, ) -> Result { let account = protect_account_route(&http_req, &ctx).await?; diff --git a/scheduler/crates/api/src/account/remove_account_integration.rs b/scheduler/crates/api/src/account/remove_account_integration.rs index 19ec9775..34661b98 100644 --- a/scheduler/crates/api/src/account/remove_account_integration.rs +++ b/scheduler/crates/api/src/account/remove_account_integration.rs @@ -1,12 +1,12 @@ use crate::shared::usecase::{execute, UseCase}; use crate::{error::NettuError, shared::auth::protect_account_route}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::remove_account_integration::{APIResponse, PathParams}; use nettu_scheduler_domain::{Account, IntegrationProvider}; use nettu_scheduler_infra::NettuContext; pub async fn remove_account_integration_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, mut path: web::Path, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/account/set_account_pub_key.rs b/scheduler/crates/api/src/account/set_account_pub_key.rs index d248c47c..d68336a6 100644 --- a/scheduler/crates/api/src/account/set_account_pub_key.rs +++ b/scheduler/crates/api/src/account/set_account_pub_key.rs @@ -1,12 +1,12 @@ use crate::shared::usecase::{execute, UseCase}; use crate::{error::NettuError, shared::auth::protect_account_route}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::set_account_pub_key::{APIResponse, RequestBody}; use nettu_scheduler_domain::{Account, PEMKey}; use nettu_scheduler_infra::NettuContext; pub async fn set_account_pub_key_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, body: web::Json, ) -> Result { diff --git a/scheduler/crates/api/src/account/set_account_webhook.rs b/scheduler/crates/api/src/account/set_account_webhook.rs index 19cfc5ce..fb2a6e2a 100644 --- a/scheduler/crates/api/src/account/set_account_webhook.rs +++ b/scheduler/crates/api/src/account/set_account_webhook.rs @@ -1,12 +1,12 @@ use crate::shared::usecase::{execute, UseCase}; use crate::{error::NettuError, shared::auth::protect_account_route}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::set_account_webhook::{APIResponse, RequestBody}; use nettu_scheduler_domain::Account; use nettu_scheduler_infra::NettuContext; pub async fn set_account_webhook_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, body: web::Json, ) -> Result { diff --git a/scheduler/crates/api/src/calendar/add_sync_calendar.rs b/scheduler/crates/api/src/calendar/add_sync_calendar.rs index 9831436c..fb718756 100644 --- a/scheduler/crates/api/src/calendar/add_sync_calendar.rs +++ b/scheduler/crates/api/src/calendar/add_sync_calendar.rs @@ -4,7 +4,7 @@ use crate::{ error::NettuError, shared::usecase::{execute, UseCase}, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::add_sync_calendar::{APIResponse, PathParams, RequestBody}; use nettu_scheduler_domain::IntegrationProvider; use nettu_scheduler_domain::{ @@ -17,7 +17,7 @@ use nettu_scheduler_infra::{ }; pub async fn add_sync_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path_params: web::Path, body: web::Json, ctx: web::Data, diff --git a/scheduler/crates/api/src/calendar/create_calendar.rs b/scheduler/crates/api/src/calendar/create_calendar.rs index 8bdf6c7d..bfd6f4c2 100644 --- a/scheduler/crates/api/src/calendar/create_calendar.rs +++ b/scheduler/crates/api/src/calendar/create_calendar.rs @@ -7,7 +7,7 @@ use crate::{ error::NettuError, shared::usecase::{execute, UseCase}, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::Weekday; use chrono_tz::Tz; use nettu_scheduler_api_structs::create_calendar::{APIResponse, PathParams, RequestBody}; @@ -15,7 +15,7 @@ use nettu_scheduler_domain::{Calendar, CalendarSettings, Metadata, ID}; use nettu_scheduler_infra::NettuContext; pub async fn create_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path_params: web::Path, body: web::Json, ctx: web::Data, @@ -38,7 +38,7 @@ pub async fn create_calendar_admin_controller( } pub async fn create_calendar_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, body: web::Json, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/calendar/delete_calendar.rs b/scheduler/crates/api/src/calendar/delete_calendar.rs index aaf1c184..08ab1ae4 100644 --- a/scheduler/crates/api/src/calendar/delete_calendar.rs +++ b/scheduler/crates/api/src/calendar/delete_calendar.rs @@ -3,13 +3,13 @@ use crate::shared::{ usecase::{execute, execute_with_policy, PermissionBoundary}, }; use crate::{error::NettuError, shared::usecase::UseCase}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::delete_calendar::{APIResponse, PathParams}; use nettu_scheduler_domain::{Calendar, ID}; use nettu_scheduler_infra::NettuContext; pub async fn delete_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, ctx: web::Data, ) -> Result { @@ -28,7 +28,7 @@ pub async fn delete_calendar_admin_controller( } pub async fn delete_calendar_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/calendar/get_calendar.rs b/scheduler/crates/api/src/calendar/get_calendar.rs index 4136b7f7..e0fad48e 100644 --- a/scheduler/crates/api/src/calendar/get_calendar.rs +++ b/scheduler/crates/api/src/calendar/get_calendar.rs @@ -9,7 +9,7 @@ use nettu_scheduler_domain::{Calendar, ID}; use nettu_scheduler_infra::NettuContext; pub async fn get_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/calendar/get_calendar_events.rs b/scheduler/crates/api/src/calendar/get_calendar_events.rs index 681b5449..368d3070 100644 --- a/scheduler/crates/api/src/calendar/get_calendar_events.rs +++ b/scheduler/crates/api/src/calendar/get_calendar_events.rs @@ -7,7 +7,7 @@ use nettu_scheduler_domain::{Calendar, EventWithInstances, TimeSpan, ID}; use nettu_scheduler_infra::NettuContext; pub async fn get_calendar_events_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, query_params: web::Query, path: web::Path, ctx: web::Data, diff --git a/scheduler/crates/api/src/calendar/get_google_calendars.rs b/scheduler/crates/api/src/calendar/get_google_calendars.rs index 2f84672f..ecfb533b 100644 --- a/scheduler/crates/api/src/calendar/get_google_calendars.rs +++ b/scheduler/crates/api/src/calendar/get_google_calendars.rs @@ -12,7 +12,7 @@ use nettu_scheduler_domain::{ use nettu_scheduler_infra::{google_calendar::GoogleCalendarProvider, NettuContext}; pub async fn get_google_calendars_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, query: web::Query, ctx: web::Data, diff --git a/scheduler/crates/api/src/calendar/get_outlook_calendars.rs b/scheduler/crates/api/src/calendar/get_outlook_calendars.rs index 4d225525..3028feb3 100644 --- a/scheduler/crates/api/src/calendar/get_outlook_calendars.rs +++ b/scheduler/crates/api/src/calendar/get_outlook_calendars.rs @@ -12,7 +12,7 @@ use nettu_scheduler_domain::{ use nettu_scheduler_infra::{outlook_calendar::OutlookCalendarProvider, NettuContext}; pub async fn get_outlook_calendars_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, query: web::Query, ctx: web::Data, diff --git a/scheduler/crates/api/src/calendar/remove_sync_calendar.rs b/scheduler/crates/api/src/calendar/remove_sync_calendar.rs index c99ad18c..17bf2292 100644 --- a/scheduler/crates/api/src/calendar/remove_sync_calendar.rs +++ b/scheduler/crates/api/src/calendar/remove_sync_calendar.rs @@ -4,7 +4,7 @@ use crate::{ error::NettuError, shared::usecase::{execute, UseCase}, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::remove_sync_calendar::{APIResponse, PathParams, RequestBody}; use nettu_scheduler_domain::IntegrationProvider; use nettu_scheduler_domain::{User, ID}; @@ -20,7 +20,7 @@ fn error_handler(e: UseCaseError) -> NettuError { } pub async fn remove_sync_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path_params: web::Path, body: web::Json, ctx: web::Data, diff --git a/scheduler/crates/api/src/calendar/update_calendar.rs b/scheduler/crates/api/src/calendar/update_calendar.rs index 5f63c584..338c5af8 100644 --- a/scheduler/crates/api/src/calendar/update_calendar.rs +++ b/scheduler/crates/api/src/calendar/update_calendar.rs @@ -5,7 +5,7 @@ use crate::shared::{ usecase::{execute, execute_with_policy, PermissionBoundary, UseCase}, }; use crate::{error::NettuError, shared::auth::protect_route}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono::Weekday; use chrono_tz::Tz; use nettu_scheduler_api_structs::update_calendar::{APIResponse, PathParams, RequestBody}; @@ -13,7 +13,7 @@ use nettu_scheduler_domain::{Calendar, Metadata, User, ID}; use nettu_scheduler_infra::NettuContext; pub async fn update_calendar_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, path: web::Path, body: web::Json, @@ -37,7 +37,7 @@ pub async fn update_calendar_admin_controller( } pub async fn update_calendar_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, mut path: web::Path, body: web::Json, diff --git a/scheduler/crates/api/src/event/create_event.rs b/scheduler/crates/api/src/event/create_event.rs index 7b3c4bae..0858a145 100644 --- a/scheduler/crates/api/src/event/create_event.rs +++ b/scheduler/crates/api/src/event/create_event.rs @@ -5,7 +5,7 @@ use crate::shared::{ auth::{account_can_modify_user, protect_account_route, protect_route, Permission}, usecase::{execute, execute_with_policy, PermissionBoundary, Subscriber, UseCase}, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::create_event::*; use nettu_scheduler_domain::{ CalendarEvent, CalendarEventReminder, Metadata, RRuleOptions, User, ID, @@ -13,7 +13,7 @@ use nettu_scheduler_domain::{ use nettu_scheduler_infra::NettuContext; pub async fn create_event_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path_params: web::Path, body: web::Json, ctx: web::Data, @@ -41,7 +41,7 @@ pub async fn create_event_admin_controller( } pub async fn create_event_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, body: web::Json, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/schedule/create_schedule.rs b/scheduler/crates/api/src/schedule/create_schedule.rs index 4044c1a2..156eb5fa 100644 --- a/scheduler/crates/api/src/schedule/create_schedule.rs +++ b/scheduler/crates/api/src/schedule/create_schedule.rs @@ -9,14 +9,14 @@ use crate::{ usecase::{execute_with_policy, PermissionBoundary}, }, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono_tz::Tz; use nettu_scheduler_api_structs::create_schedule::*; use nettu_scheduler_domain::{Metadata, Schedule, ScheduleRule, ID}; use nettu_scheduler_infra::NettuContext; pub async fn create_schedule_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path_params: web::Path, body_params: web::Json, ctx: web::Data, @@ -39,7 +39,7 @@ pub async fn create_schedule_admin_controller( } pub async fn create_schedule_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, body_params: web::Json, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/schedule/delete_schedule.rs b/scheduler/crates/api/src/schedule/delete_schedule.rs index 9704ac01..d8e5904f 100644 --- a/scheduler/crates/api/src/schedule/delete_schedule.rs +++ b/scheduler/crates/api/src/schedule/delete_schedule.rs @@ -3,13 +3,13 @@ use crate::shared::{ usecase::{execute, execute_with_policy, PermissionBoundary}, }; use crate::{error::NettuError, shared::usecase::UseCase}; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use nettu_scheduler_api_structs::delete_schedule::*; use nettu_scheduler_domain::{Schedule, ID}; use nettu_scheduler_infra::NettuContext; pub async fn delete_schedule_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, ctx: web::Data, ) -> Result { @@ -28,7 +28,7 @@ pub async fn delete_schedule_admin_controller( } pub async fn delete_schedule_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, ctx: web::Data, ) -> Result { diff --git a/scheduler/crates/api/src/schedule/update_schedule.rs b/scheduler/crates/api/src/schedule/update_schedule.rs index 2e5ad820..2f181eb7 100644 --- a/scheduler/crates/api/src/schedule/update_schedule.rs +++ b/scheduler/crates/api/src/schedule/update_schedule.rs @@ -9,14 +9,14 @@ use crate::{ usecase::{execute_with_policy, PermissionBoundary}, }, }; -use actix_web::{web, HttpResponse}; +use actix_web::{web, HttpRequest, HttpResponse}; use chrono_tz::Tz; use nettu_scheduler_api_structs::update_schedule::*; use nettu_scheduler_domain::{Metadata, Schedule, ScheduleRule, ID}; use nettu_scheduler_infra::NettuContext; pub async fn update_schedule_admin_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, path: web::Path, body: web::Json, ctx: web::Data, @@ -40,7 +40,7 @@ pub async fn update_schedule_admin_controller( } pub async fn update_schedule_controller( - http_req: web::HttpRequest, + http_req: HttpRequest, ctx: web::Data, mut path: web::Path, body: web::Json,