Add qr code login

Cargo.toml

@@ -67,7 +67,7 @@ tracing-core = "0.1.32"
 uniffi = { version = "0.27.1" }
 uniffi_bindgen = { version = "0.27.1" }
 url = "2.5.0"
-vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "826d0aa22a9b5405535927c7691492db4b92a43b" }
+vodozemac = { git = "https://github.com/matrix-org/vodozemac/", rev = "4ef989c6a8eba0bc809e285a081c56320a9bbf1e" }
 wiremock = "0.6.0"
 zeroize = "1.6.0"
 

crates/matrix-sdk/Cargo.toml

@@ -45,6 +45,7 @@ uniffi = ["dep:uniffi", "matrix-sdk-base/uniffi"]
 
 experimental-oidc = [
     "ruma/unstable-msc2967",
+    "ruma/unstable-msc4108",
     "dep:chrono",
     "dep:http_old",
     "dep:language-tags",
@@ -72,6 +73,7 @@ async-channel = "2.2.1"
 async-stream = { workspace = true }
 async-trait = { workspace = true }
 axum = { version = "0.7.4", optional = true }
+base64 = { workspace = true }
 bytes = "1.1.0"
 bytesize = "1.1"
 chrono = { version = "0.4.23", optional = true }
@@ -96,6 +98,7 @@ matrix-sdk-sqlite = { workspace = true, optional = true }
 matrix-sdk-test = { workspace = true, optional = true }
 mime = "0.3.16"
 mime2ext = "0.1.52"
+openidconnect = { git = "https://github.com/poljar/openidconnect-rs", rev = "c7e1dc31b83dd7559125984bfd36b9c0f191585e" }
 rand = { workspace = true , optional = true }
 ruma = { workspace = true, features = ["rand", "unstable-msc2448", "unstable-msc2965", "unstable-msc3930", "unstable-msc3245-v1-compat", "unstable-msc2867"] }
 serde = { workspace = true }
@@ -108,9 +111,10 @@ tokio-stream = { workspace = true, features = ["sync"] }
 tower = { version = "0.4.13", features = ["make"], optional = true }
 tracing = { workspace = true, features = ["attributes"] }
 uniffi = { workspace = true, optional = true }
-url = { workspace = true }
+url = { workspace = true, features = ["serde"] }
 urlencoding = "2.1.3"
 uuid = { version = "1.4.1", features = ["serde", "v4"], optional = true }
+vodozemac = { workspace = true }
 zeroize = { workspace = true }
 
 [dependencies.image]
@@ -144,6 +148,7 @@ matrix-sdk-base = { workspace = true, features = ["testing"] }
 matrix-sdk-test = { workspace = true }
 once_cell = { workspace = true }
 serde_urlencoded = "0.7.1"
+similar-asserts = "1.5.0"
 stream_assert = { workspace = true }
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
 

crates/matrix-sdk/src/authentication/mod.rs

@@ -12,7 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//! Types and functions related to authentication in Matrix.
+
 // TODO:(pixlwave) Move AuthenticationService from the FFI into this module.
+// TODO:(poljar) Move the oidc and matrix_auth modules under this module.
 
 use std::pin::Pin;
 
@@ -28,6 +31,9 @@ use crate::{
     Client, RefreshTokenError, SessionChange,
 };
 
+#[cfg(all(feature = "experimental-oidc", feature = "e2e-encryption"))]
+pub mod qrcode;
+
 /// Session tokens, for any kind of authentication.
 #[allow(missing_debug_implementations, clippy::large_enum_variant)]
 pub enum SessionTokens {