mirror of
https://github.com/element-hq/matrix-authentication-service.git
synced 2026-05-14 03:55:15 +00:00
Merge branch 'main' into quenting/storage-repository
This commit is contained in:
@@ -25,7 +25,7 @@ jobs:
|
||||
|
||||
- name: Build the documentation
|
||||
run: mdbook build
|
||||
|
||||
|
||||
- name: Upload GitHub Pages artifacts
|
||||
uses: actions/upload-pages-artifact@v1.0.7
|
||||
|
||||
|
||||
Generated
+43
-28
@@ -178,9 +178,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-graphql"
|
||||
version = "5.0.4"
|
||||
version = "5.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d56592fdc896f45ca73e04f9562033f95ab38b33878155464003187190bb4ba"
|
||||
checksum = "6c7c1f9bf1a875b047e97404d16313b3dde09ea06d0639800c9657138e38a441"
|
||||
dependencies = [
|
||||
"async-graphql-derive",
|
||||
"async-graphql-parser",
|
||||
@@ -193,6 +193,7 @@ dependencies = [
|
||||
"fast_chemail",
|
||||
"fnv",
|
||||
"futures-util",
|
||||
"handlebars",
|
||||
"http",
|
||||
"indexmap",
|
||||
"mime",
|
||||
@@ -214,9 +215,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-graphql-derive"
|
||||
version = "5.0.4"
|
||||
version = "5.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5cbc24a7c61fb52fa8eb563b8ca60ec890d54778be644796ef72047a07c555b2"
|
||||
checksum = "381ed1575c53cfc864013932bb5a5df05c21802781dfa6dd27c57068eac9a80d"
|
||||
dependencies = [
|
||||
"Inflector",
|
||||
"async-graphql-parser",
|
||||
@@ -230,9 +231,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-graphql-parser"
|
||||
version = "5.0.4"
|
||||
version = "5.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a7dd090476ce5300418018518c25f2247576a214ffadc504f2af1f074939daf8"
|
||||
checksum = "41a7ec217e184ca3034c806957842afb28914f894b69cb5a76b4a57e64f44506"
|
||||
dependencies = [
|
||||
"async-graphql-value",
|
||||
"pest",
|
||||
@@ -242,9 +243,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-graphql-value"
|
||||
version = "5.0.4"
|
||||
version = "5.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "305055a67bece03b7c870544b38d5ed87aaa4d6792f14e4aabdd33e5e43120fa"
|
||||
checksum = "e294ef57859c27d31a9bb23edf1db948f7534445df30115d8672314f65451858"
|
||||
dependencies = [
|
||||
"bytes 1.3.0",
|
||||
"indexmap",
|
||||
@@ -275,9 +276,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.60"
|
||||
version = "0.1.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
|
||||
checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -606,9 +607,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum"
|
||||
version = "0.6.1"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48"
|
||||
checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"axum-core",
|
||||
@@ -640,9 +641,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum-core"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
|
||||
checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bytes 1.3.0",
|
||||
@@ -677,9 +678,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "axum-macros"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621"
|
||||
checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -860,9 +861,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "camino"
|
||||
version = "1.1.1"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
|
||||
checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
@@ -1053,9 +1054,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "console"
|
||||
version = "0.15.3"
|
||||
version = "0.15.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5556015fe3aad8b968e5d4124980fbe2f6aaee7aeec6b749de1faaa2ca5d0a4c"
|
||||
checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a"
|
||||
dependencies = [
|
||||
"encode_unicode",
|
||||
"lazy_static",
|
||||
@@ -2038,6 +2039,20 @@ dependencies = [
|
||||
"tracing",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "handlebars"
|
||||
version = "4.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
|
||||
dependencies = [
|
||||
"log",
|
||||
"pest",
|
||||
"pest_derive",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.12.3"
|
||||
@@ -2386,9 +2401,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "insta"
|
||||
version = "1.23.0"
|
||||
version = "1.26.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e48b08a091dfe5b09a6a9688c468fdd5b4396e92ce09e2eb932f0884b02788a4"
|
||||
checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff"
|
||||
dependencies = [
|
||||
"console",
|
||||
"lazy_static",
|
||||
@@ -3412,9 +3427,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.16.0"
|
||||
version = "1.17.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
|
||||
checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
|
||||
|
||||
[[package]]
|
||||
name = "opa-wasm"
|
||||
@@ -5239,9 +5254,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.23.0"
|
||||
version = "1.24.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
|
||||
checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes 1.3.0",
|
||||
@@ -6293,9 +6308,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wiremock"
|
||||
version = "0.5.15"
|
||||
version = "0.5.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "249dc68542861d17eae4b4e5e8fb381c2f9e8f255a84f6771d5fdf8b6c03ce3c"
|
||||
checksum = "631cafe37a030d8453218cf7c650abcc359be8fba4a2fbc5c27fdb9728635406"
|
||||
dependencies = [
|
||||
"assert-json-diff",
|
||||
"async-trait",
|
||||
|
||||
@@ -6,8 +6,8 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.60"
|
||||
axum = { version = "0.6.1", features = ["headers"] }
|
||||
async-trait = "0.1.61"
|
||||
axum = { version = "0.6.2", features = ["headers"] }
|
||||
axum-extra = { version = "0.4.2", features = ["cookie-private"] }
|
||||
chrono = "0.4.23"
|
||||
data-encoding = "2.3.3"
|
||||
@@ -22,7 +22,7 @@ serde_with = "2.1.0"
|
||||
serde_urlencoded = "0.7.1"
|
||||
serde_json = "1.0.91"
|
||||
thiserror = "1.0.38"
|
||||
tokio = "1.23.0"
|
||||
tokio = "1.24.1"
|
||||
tower = { version = "0.4.13", features = ["util"] }
|
||||
tracing = "0.1.37"
|
||||
url = "2.3.1"
|
||||
|
||||
@@ -8,8 +8,8 @@ license = "Apache-2.0"
|
||||
[dependencies]
|
||||
anyhow = "1.0.68"
|
||||
atty = "0.2.14"
|
||||
axum = "0.6.1"
|
||||
camino = "1.1.1"
|
||||
axum = "0.6.2"
|
||||
camino = "1.1.2"
|
||||
clap = { version = "4.0.32", features = ["derive"] }
|
||||
dotenv = "0.15.0"
|
||||
hyper = { version = "0.14.23", features = ["full"] }
|
||||
@@ -21,7 +21,7 @@ rustls = "0.20.7"
|
||||
serde_json = "1.0.91"
|
||||
serde_yaml = "0.9.16"
|
||||
sqlx = { version = "0.6.2", features = ["runtime-tokio-rustls", "postgres"] }
|
||||
tokio = { version = "1.23.0", features = ["full"] }
|
||||
tokio = { version = "1.24.1", features = ["full"] }
|
||||
tower = { version = "0.4.13", features = ["full"] }
|
||||
tower-http = { version = "0.3.5", features = ["fs", "compression-full"] }
|
||||
url = "2.3.1"
|
||||
|
||||
@@ -6,14 +6,14 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1.23.0", features = ["fs", "rt"] }
|
||||
tokio = { version = "1.24.1", features = ["fs", "rt"] }
|
||||
tracing = { version = "0.1.37" }
|
||||
async-trait = "0.1.60"
|
||||
async-trait = "0.1.61"
|
||||
|
||||
thiserror = "1.0.38"
|
||||
anyhow = "1.0.68"
|
||||
|
||||
camino = { version = "1.1.1", features = ["serde1"] }
|
||||
camino = { version = "1.1.2", features = ["serde1"] }
|
||||
chrono = { version = "0.4.23", features = ["serde"] }
|
||||
figment = { version = "0.10.8", features = ["env", "yaml", "test"] }
|
||||
schemars = { version = "0.8.11", features = ["url", "chrono"] }
|
||||
|
||||
@@ -6,7 +6,7 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
async-trait = "0.1.60"
|
||||
async-trait = "0.1.61"
|
||||
tracing = "0.1.37"
|
||||
thiserror = "1.0.38"
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.68"
|
||||
async-graphql = { version = "5.0.4", features = ["chrono", "url"] }
|
||||
async-graphql = { version = "5.0.5", features = ["chrono", "url"] }
|
||||
chrono = "0.4.23"
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
tokio = { version = "1.23.0", features = ["sync"] }
|
||||
|
||||
@@ -7,7 +7,7 @@ license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
# Async runtime
|
||||
tokio = { version = "1.23.0", features = ["macros"] }
|
||||
tokio = { version = "1.24.1", features = ["macros"] }
|
||||
futures-util = "0.3.25"
|
||||
|
||||
# Logging and tracing
|
||||
@@ -21,11 +21,11 @@ anyhow = "1.0.68"
|
||||
hyper = { version = "0.14.23", features = ["full"] }
|
||||
tower = "0.4.13"
|
||||
tower-http = { version = "0.3.5", features = ["cors"] }
|
||||
axum = "0.6.1"
|
||||
axum-macros = "0.3.0"
|
||||
axum = "0.6.2"
|
||||
axum-macros = "0.3.1"
|
||||
axum-extra = { version = "0.4.2", features = ["cookie-private"] }
|
||||
|
||||
async-graphql = { version = "5.0.4", features = ["tracing", "apollo_tracing"] }
|
||||
async-graphql = { version = "5.0.5", features = ["tracing", "apollo_tracing"] }
|
||||
|
||||
# Emails
|
||||
lettre = { version = "0.10.1", default-features = false, features = ["builder"] }
|
||||
@@ -46,7 +46,7 @@ pbkdf2 = { version = "0.11.0", features = ["password-hash", "std"] }
|
||||
zeroize = "1.5.7"
|
||||
|
||||
# Various data types and utilities
|
||||
camino = "1.1.1"
|
||||
camino = "1.1.2"
|
||||
chrono = { version = "0.4.23", features = ["serde"] }
|
||||
time = "0.3.17"
|
||||
url = { version = "2.3.1", features = ["serde"] }
|
||||
@@ -74,7 +74,7 @@ oauth2-types = { path = "../oauth2-types" }
|
||||
|
||||
[dev-dependencies]
|
||||
indoc = "1.0.8"
|
||||
insta = "1.23.0"
|
||||
insta = "1.26.0"
|
||||
|
||||
[features]
|
||||
# Use the native root certificates
|
||||
|
||||
@@ -8,7 +8,7 @@ license = "Apache-2.0"
|
||||
[dependencies]
|
||||
aws-smithy-http = { version = "0.52.0", optional = true }
|
||||
aws-types = { version = "0.52.0", optional = true }
|
||||
axum = { version = "0.6.1", optional = true }
|
||||
axum = { version = "0.6.2", optional = true }
|
||||
bytes = "1.3.0"
|
||||
futures-util = "0.3.25"
|
||||
headers = "0.3.8"
|
||||
@@ -16,7 +16,7 @@ http = "0.2.8"
|
||||
http-body = "0.4.5"
|
||||
hyper = "0.14.23"
|
||||
hyper-rustls = { version = "0.23.2", features = ["http1", "http2"], default-features = false, optional = true }
|
||||
once_cell = "1.16.0"
|
||||
once_cell = "1.17.0"
|
||||
opentelemetry = "0.18.0"
|
||||
opentelemetry-http = "0.7.0"
|
||||
opentelemetry-semantic-conventions = "0.10.0"
|
||||
@@ -26,7 +26,7 @@ serde = "1.0.152"
|
||||
serde_json = "1.0.91"
|
||||
serde_urlencoded = "0.7.1"
|
||||
thiserror = "1.0.38"
|
||||
tokio = { version = "1.23.0", features = ["sync", "parking_lot"], optional = true }
|
||||
tokio = { version = "1.24.1", features = ["sync", "parking_lot"], optional = true }
|
||||
tower = { version = "0.4.13", features = [] }
|
||||
tower-http = { version = "0.3.5", features = ["cors"] }
|
||||
tracing = "0.1.37"
|
||||
@@ -37,7 +37,7 @@ webpki-roots = { version = "0.22.6", optional = true }
|
||||
[dev-dependencies]
|
||||
anyhow = "1.0.68"
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
tokio = { version = "1.23.0", features = ["macros", "rt"] }
|
||||
tokio = { version = "1.24.1", features = ["macros", "rt"] }
|
||||
tower = { version = "0.4.13", features = ["util"] }
|
||||
|
||||
[features]
|
||||
|
||||
@@ -7,13 +7,13 @@ license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.68"
|
||||
async-trait = "0.1.60"
|
||||
camino = "1.1.1"
|
||||
async-trait = "0.1.61"
|
||||
camino = "1.1.2"
|
||||
convert_case = "0.6.0"
|
||||
csv = "1.1.6"
|
||||
futures-util = "0.3.25"
|
||||
reqwest = { version = "0.11.13", features = ["blocking", "rustls-tls"], default-features = false }
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
tokio = { version = "1.23.0", features = ["full"] }
|
||||
tokio = { version = "1.24.1", features = ["full"] }
|
||||
tracing = "0.1.37"
|
||||
tracing-subscriber = "0.3.16"
|
||||
|
||||
@@ -32,5 +32,5 @@ url = { version = "2.3.1", features = ["serde"] }
|
||||
mas-iana = { path = "../iana" }
|
||||
|
||||
[dev-dependencies]
|
||||
insta = { version = "1.23.0" }
|
||||
insta = { version = "1.26.0" }
|
||||
rand_chacha = "0.3.1"
|
||||
|
||||
@@ -32,5 +32,5 @@ mas-iana = { path = "../iana" }
|
||||
mas-jose = { path = "../jose" }
|
||||
|
||||
[dev-dependencies]
|
||||
insta = { version = "1.23.0", features = ["yaml"] }
|
||||
insta = { version = "1.26.0", features = ["yaml"] }
|
||||
rand_chacha = "0.3.1"
|
||||
|
||||
@@ -12,7 +12,7 @@ http-body = "0.4.5"
|
||||
hyper = { version = "0.14.23", features = ["server", "http1", "http2", "tcp"] }
|
||||
pin-project-lite = "0.2.9"
|
||||
thiserror = "1.0.38"
|
||||
tokio = { version = "1.23.0", features = ["net", "rt", "macros", "signal", "time"] }
|
||||
tokio = { version = "1.24.1", features = ["net", "rt", "macros", "signal", "time"] }
|
||||
tokio-rustls = "0.23.4"
|
||||
tower-http = { version = "0.3.5", features = ["add-extension"] }
|
||||
tower-service = "0.3.2"
|
||||
@@ -22,7 +22,7 @@ libc = "0.2.139"
|
||||
[dev-dependencies]
|
||||
anyhow = "1.0.68"
|
||||
rustls-pemfile = "1.0.1"
|
||||
tokio = { version = "1.23.0", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
|
||||
tokio = { version = "1.24.1", features = ["net", "rt", "macros", "signal", "time", "rt-multi-thread"] }
|
||||
tokio-test = "0.4.2"
|
||||
tracing-subscriber = "0.3.16"
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ futures-signals = "0.3.31"
|
||||
futures-util = "0.3.25"
|
||||
headers = "0.3.8"
|
||||
http = "0.2.8"
|
||||
once_cell = "1.16.0"
|
||||
once_cell = "1.17.0"
|
||||
mime = "0.3.16"
|
||||
rand = "0.8.5"
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
@@ -35,7 +35,7 @@ serde_json = "1.0.91"
|
||||
serde_urlencoded = "0.7.1"
|
||||
serde_with = "2.1.0"
|
||||
thiserror = "1.0.38"
|
||||
tokio = { version = "1.23.0", features = ["rt", "macros", "rt-multi-thread"] }
|
||||
tokio = { version = "1.24.1", features = ["rt", "macros", "rt-multi-thread"] }
|
||||
tower = { version = "0.4.13", features = ["full"] }
|
||||
tracing = "0.1.37"
|
||||
url = { version = "2.3.1", features = ["serde"] }
|
||||
@@ -68,4 +68,4 @@ assert_matches = "1.5.0"
|
||||
bitflags = "1.3.2"
|
||||
mas-keystore = { path = "../keystore" }
|
||||
rand_chacha = "0.3.1"
|
||||
wiremock = "0.5.15"
|
||||
wiremock = "0.5.16"
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
//! Types and methods for client credentials.
|
||||
|
||||
use std::{collections::HashMap, fmt};
|
||||
use std::{collections::HashMap, fmt, sync::Arc};
|
||||
|
||||
use base64ct::{Base64UrlUnpadded, Encoding};
|
||||
use chrono::{DateTime, Duration, Utc};
|
||||
@@ -56,13 +56,14 @@ pub type JwtSigningFn =
|
||||
dyn Fn(HashMap<String, Value>, JsonWebSignatureAlg) -> Result<String, BoxError> + Send + Sync;
|
||||
|
||||
/// The method used to sign JWTs with a private key.
|
||||
#[derive(Clone)]
|
||||
pub enum JwtSigningMethod {
|
||||
/// Sign the JWTs with this library, by providing the signing keys.
|
||||
#[cfg(feature = "keystore")]
|
||||
Keystore(Keystore),
|
||||
|
||||
/// Sign the JWTs in a callback.
|
||||
Custom(Box<JwtSigningFn>),
|
||||
Custom(Arc<JwtSigningFn>),
|
||||
}
|
||||
|
||||
impl JwtSigningMethod {
|
||||
@@ -82,7 +83,7 @@ impl JwtSigningMethod {
|
||||
+ Sync
|
||||
+ 'static,
|
||||
{
|
||||
Self::Custom(Box::new(signing_fn))
|
||||
Self::Custom(Arc::new(signing_fn))
|
||||
}
|
||||
|
||||
/// Get the [`Keystore`] from this [`JwtSigningMethod`].
|
||||
@@ -99,7 +100,7 @@ impl JwtSigningMethod {
|
||||
#[must_use]
|
||||
pub fn jwt_custom(&self) -> Option<&JwtSigningFn> {
|
||||
match self {
|
||||
JwtSigningMethod::Custom(s) => Some(s),
|
||||
JwtSigningMethod::Custom(s) => Some(s.as_ref()),
|
||||
JwtSigningMethod::Keystore(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
serde_json = "1.0.91"
|
||||
thiserror = "1.0.38"
|
||||
tokio = { version = "1.23.0", features = ["io-util"] }
|
||||
tokio = { version = "1.24.1", features = ["io-util"] }
|
||||
tracing = "0.1.37"
|
||||
wasmtime = { version = "4.0.0", default-features = false, features = ["async", "cranelift"] }
|
||||
|
||||
@@ -19,7 +19,7 @@ mas-data-model = { path = "../data-model" }
|
||||
oauth2-types = { path = "../oauth2-types" }
|
||||
|
||||
[dev-dependencies]
|
||||
tokio = { version = "1.23.0", features = ["fs", "rt", "macros"] }
|
||||
tokio = { version = "1.24.1", features = ["fs", "rt", "macros"] }
|
||||
|
||||
[features]
|
||||
cache = ["wasmtime/cache"]
|
||||
|
||||
@@ -6,7 +6,7 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
axum = { version = "0.6.1", default-features = false }
|
||||
axum = { version = "0.6.2", default-features = false }
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
serde_urlencoded = "0.7.1"
|
||||
url = "2.3.1"
|
||||
|
||||
@@ -9,12 +9,12 @@ license = "Apache-2.0"
|
||||
serde = { version = "1.0.152", features = ["derive"] }
|
||||
serde_json = "1.0.91"
|
||||
thiserror = "1.0.38"
|
||||
camino = { version = "1.1.1", features = ["serde1"] }
|
||||
camino = { version = "1.1.2", features = ["serde1"] }
|
||||
headers = "0.3.8"
|
||||
http = "0.2.8"
|
||||
tower-service = "0.3.2"
|
||||
tower-http = { version = "0.3.5", features = ["fs"] }
|
||||
tokio = { version = "1.23.0", features = ["fs"] }
|
||||
tokio = { version = "1.24.1", features = ["fs"] }
|
||||
|
||||
[[bin]]
|
||||
name = "render"
|
||||
|
||||
@@ -6,8 +6,8 @@ edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
tokio = "1.23.0"
|
||||
async-trait = "0.1.60"
|
||||
tokio = "1.24.1"
|
||||
async-trait = "0.1.61"
|
||||
tokio-stream = "0.1.11"
|
||||
futures-util = "0.3.25"
|
||||
tracing = "0.1.37"
|
||||
|
||||
@@ -7,7 +7,7 @@ license = "Apache-2.0"
|
||||
|
||||
[dependencies]
|
||||
tracing = "0.1.37"
|
||||
tokio = { version = "1.23.0", features = ["macros", "rt"] }
|
||||
tokio = { version = "1.24.1", features = ["macros", "rt"] }
|
||||
|
||||
anyhow = "1.0.68"
|
||||
thiserror = "1.0.38"
|
||||
@@ -17,7 +17,7 @@ serde = { version = "1.0.152", features = ["derive"] }
|
||||
serde_json = "1.0.91"
|
||||
serde_urlencoded = "0.7.1"
|
||||
|
||||
camino = "1.1.1"
|
||||
camino = "1.1.2"
|
||||
chrono = "0.4.23"
|
||||
url = "2.3.1"
|
||||
http = "0.2.8"
|
||||
|
||||
Generated
+1016
-1002
File diff suppressed because it is too large
Load Diff
+19
-19
@@ -27,30 +27,30 @@
|
||||
"@babel/preset-react": "^7.18.6",
|
||||
"@babel/preset-typescript": "^7.18.6",
|
||||
"@graphql-eslint/eslint-plugin": "^3.14.3",
|
||||
"@storybook/addon-actions": "^7.0.0-beta.15",
|
||||
"@storybook/addon-backgrounds": "^7.0.0-beta.15",
|
||||
"@storybook/addon-controls": "^7.0.0-beta.15",
|
||||
"@storybook/addon-docs": "^7.0.0-beta.15",
|
||||
"@storybook/addon-essentials": "^7.0.0-beta.15",
|
||||
"@storybook/addon-measure": "^7.0.0-beta.15",
|
||||
"@storybook/addon-outline": "^7.0.0-beta.15",
|
||||
"@storybook/addon-toolbars": "^7.0.0-beta.15",
|
||||
"@storybook/addon-viewport": "^7.0.0-beta.15",
|
||||
"@storybook/react": "^7.0.0-beta.15",
|
||||
"@storybook/react-vite": "^7.0.0-beta.15",
|
||||
"@types/jest": "^29.2.4",
|
||||
"@storybook/addon-actions": "^7.0.0-beta.19",
|
||||
"@storybook/addon-backgrounds": "^7.0.0-beta.19",
|
||||
"@storybook/addon-controls": "^7.0.0-beta.19",
|
||||
"@storybook/addon-docs": "^7.0.0-beta.19",
|
||||
"@storybook/addon-essentials": "^7.0.0-beta.19",
|
||||
"@storybook/addon-measure": "^7.0.0-beta.19",
|
||||
"@storybook/addon-outline": "^7.0.0-beta.19",
|
||||
"@storybook/addon-toolbars": "^7.0.0-beta.19",
|
||||
"@storybook/addon-viewport": "^7.0.0-beta.19",
|
||||
"@storybook/react": "^7.0.0-beta.19",
|
||||
"@storybook/react-vite": "^7.0.0-beta.19",
|
||||
"@types/jest": "^29.2.5",
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/react": "^18.0.26",
|
||||
"@types/react-dom": "^18.0.10",
|
||||
"@types/react-relay": "^14.1.2",
|
||||
"@types/react-relay": "^14.1.3",
|
||||
"@types/react-test-renderer": "^18.0.0",
|
||||
"@types/relay-runtime": "^14.1.4",
|
||||
"@types/relay-runtime": "^14.1.6",
|
||||
"@types/relay-test-utils": "^14.1.0",
|
||||
"@vitejs/plugin-react": "^3.0.0",
|
||||
"@vitejs/plugin-react": "^3.0.1",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"babel-plugin-relay": "^14.1.0",
|
||||
"eslint": "^8.30.0",
|
||||
"eslint-config-prettier": "^8.5.0",
|
||||
"eslint": "^8.31.0",
|
||||
"eslint-config-prettier": "^8.6.0",
|
||||
"eslint-config-react-app": "^7.0.1",
|
||||
"eslint-plugin-prettier": "^4.2.1",
|
||||
"jest": "^29.3.1",
|
||||
@@ -59,10 +59,10 @@
|
||||
"react-test-renderer": "^18.2.0",
|
||||
"relay-compiler": "^14.1.0",
|
||||
"relay-test-utils": "^14.1.0",
|
||||
"storybook": "^7.0.0-beta.15",
|
||||
"storybook": "^7.0.0-beta.19",
|
||||
"tailwindcss": "^3.2.2",
|
||||
"typescript": "^4.6.4",
|
||||
"vite": "^4.0.3",
|
||||
"vite": "^4.0.4",
|
||||
"vite-plugin-eslint": "^1.8.1",
|
||||
"vite-plugin-relay": "^2.0.0"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user