mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-02-07 22:22:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(qr-login): Attempt to export the secrets bundle sooner in the login process

Browse Source 
This ensures that, if we don't have a valid secrets bundle at hand we
error out as early es possible.
This commit is contained in:
Damir Jelić
2026-01-28 16:39:35 +01:00
parent 712c99f3cf
commit 4e7b77d7d0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/matrix-sdk/src/authentication/oauth/qrcode/grant.rs
View File

@@ -238,10 +238,13 @@ impl<'a> IntoFuture for GrantLoginWithScannedQrCode<'a> {
// and presented a QR code which this device has scanned.
// -- MSC4108 Secure channel setup steps 1-3
// First things first, establish the secure channel. Since we're the one that
// scanned the QR code, we're certain that the secure channel is
// secure, under the assumption that we didn't scan the wrong QR code.
// -- MSC4108 Secure channel setup steps 3-5
// First things first, export the secrets bundle and establish the secure
// channel. Since we're the one that scanned the QR code, we're
// certain that the secure channel is secure, under the assumption
// that we didn't scan the wrong QR code. -- MSC4108 Secure channel
// setup steps 3-5
let secrets_bundle = export_secrets_bundle(self.client).await?;
let mut channel = EstablishedSecureChannel::from_qr_code(
self.client.inner.http_client.inner.clone(),
self.qr_code_data,
@@ -275,7 +278,7 @@ impl<'a> IntoFuture for GrantLoginWithScannedQrCode<'a> {
self.client,
&mut channel,
self.device_creation_timeout,
&export_secrets_bundle(self.client).await?,
&secrets_bundle,
&self.state,
)
.await
@@ -326,6 +329,7 @@ impl<'a> IntoFuture for GrantLoginWithGeneratedQrCode<'a> {
// -- MSC4108 Secure channel setup steps 1 & 2
let homeserver_url = self.client.homeserver();
let http_client = self.client.inner.http_client.clone();
let secrets_bundle = export_secrets_bundle(self.client).await?;
let channel = SecureChannel::reciprocate(http_client, &homeserver_url).await?;
// Extract the QR code data and emit an update so that the caller can
@@ -365,7 +369,7 @@ impl<'a> IntoFuture for GrantLoginWithGeneratedQrCode<'a> {
self.client,
&mut channel,
self.device_creation_timeout,
&export_secrets_bundle(self.client).await?,
&secrets_bundle,
&self.state,
)
.await