jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-09 15:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use String to store UserId for uiaa request

Browse Source 
Fixes compilation error after ruma upgrade
This commit is contained in:
Moritz Bitsch 2021-12-18 19:05:18 +01:00
parent 0725b69abb
commit 720a54b3bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/database/uiaa.rs
View File

@ -21,7 +21,7 @@ use super::abstraction::Tree;
pub struct Uiaa { pub struct Uiaa {
pub(super) userdevicesessionid_uiaainfo: Arc<dyn Tree>, // User-interactive authentication pub(super) userdevicesessionid_uiaainfo: Arc<dyn Tree>, // User-interactive authentication
pub(super) userdevicesessionid_uiaarequest: pub(super) userdevicesessionid_uiaarequest:
RwLock<BTreeMap<(UserId, String, String), CanonicalJsonValue>>, RwLock<BTreeMap<(String, String, String), CanonicalJsonValue>>,
} }
impl Uiaa { impl Uiaa {
@ -155,7 +155,7 @@ impl Uiaa {
.unwrap() .unwrap()
.insert( .insert(
( (
user_id.to_owned(), user_id.to_string(),
device_id.to_string(), device_id.to_string(),
session.to_string(), session.to_string(),
), ),
@ -176,7 +176,7 @@ impl Uiaa {
.read() .read()
.unwrap() .unwrap()
.get(&( .get(&(
user_id.to_owned(), user_id.to_string(),
device_id.to_string(), device_id.to_string(),
session.to_string(), session.to_string(),
)) ))