nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix

Browse source
This commit is contained in:
timokoesters 2020-06-08 15:17:58 +02:00
parent 95047272e8
commit f2a5d46628
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/database/uiaa.rs
View file

@ -1,20 +1,12 @@
use crate::{utils, Error, Result};
use js_int::UInt;
use crate::{Error, Result};
use log::debug;
use ruma::{
api::client::{
error::ErrorKind,
r0::{
device::Device,
keys::{AlgorithmAndDeviceId, DeviceKeys, KeyAlgorithm, OneTimeKey},
uiaa::{AuthData, AuthFlow, UiaaInfo, UiaaResponse},
},
r0::uiaa::{AuthData, UiaaInfo},
},
events::{to_device::AnyToDeviceEvent, EventJson, EventType},
identifiers::UserId,
};
use serde_json::value::RawValue;
use std::{collections::BTreeMap, convert::TryFrom, time::SystemTime};
pub struct Uiaa {
pub(super) userdeviceid_uiaainfo: sled::Tree, // User-interactive authentication
@ -44,7 +36,7 @@ impl Uiaa {
let mut uiaainfo = session
.as_ref()
.map(|session| {
Ok::<_, Error>(self.get_uiaa_session(&user_id, &"".to_owned(), session)?)
Ok::<_, Error>(self.get_uiaa_session(&user_id, &device_id, session)?)
})
.unwrap_or(Ok(uiaainfo.clone()))?;