From 08b8310a00d11a9984a79669c833139f8030fc04 Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 25 Jul 2024 12:59:16 +0200 Subject: [PATCH] dependencies: get rid of custom fork of openidconnect-rs There's a published 4.0.0-alpha.2 version that compiles and doesn't require the custom changes we needed. Part of #3742. --- Cargo.lock | 6 ++++-- crates/matrix-sdk/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 732eb842928..bf8e73b9718 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3897,7 +3897,8 @@ dependencies = [ [[package]] name = "oauth2" version = "5.0.0-alpha.4" -source = "git+https://github.com/poljar/oauth2-rs?rev=f8e28ce5a7f3278ac85b8593ecdd86f2cf51fa2e#f8e28ce5a7f3278ac85b8593ecdd86f2cf51fa2e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "098af5a5110b4deacf3200682963713b143ae9d28762b739bdb7b98429dfaf68" dependencies = [ "base64 0.22.1", "chrono", @@ -3986,7 +3987,8 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openidconnect" version = "4.0.0-alpha.2" -source = "git+https://github.com/poljar/openidconnect-rs?rev=c7e1dc31b83dd7559125984bfd36b9c0f191585e#c7e1dc31b83dd7559125984bfd36b9c0f191585e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4c74c00c2727896cebfcd04018dea51902881e711c69f76a446314ab5596e2" dependencies = [ "base64 0.21.7", "chrono", diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml index 53484b31c9f..a9f35374a5d 100644 --- a/crates/matrix-sdk/Cargo.toml +++ b/crates/matrix-sdk/Cargo.toml @@ -127,7 +127,7 @@ tokio = { workspace = true, features = ["macros"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] backoff = { version = "0.4.0", features = ["tokio"] } -openidconnect = { git = "https://github.com/poljar/openidconnect-rs", rev = "c7e1dc31b83dd7559125984bfd36b9c0f191585e", optional = true } +openidconnect = { version = "4.0.0-alpha.2", optional = true } # only activate reqwest's stream feature on non-wasm, the wasm part seems to not # support *sending* streams, which makes it useless for us. reqwest = { workspace = true, features = ["stream"] }