rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: some compile time errors

Browse Source 
Only 174 errors left!
This commit is contained in:
Timo Kösters
2022-09-06 23:15:09 +02:00
committed by Nyaaori
parent 82e7f57b38
commit 057f8364cc
118 changed files with 2139 additions and 2433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/service/uiaa/mod.rs
View File

@@ -1,7 +1,9 @@
mod data;
pub use data::Data;
use ruma::{api::client::{uiaa::{UiaaInfo, IncomingAuthData, IncomingPassword, AuthType}, error::ErrorKind}, DeviceId, UserId, signatures::CanonicalJsonValue};
use tracing::error;
use crate::service::*;
use crate::{service::*, utils, Error, SERVICE};
pub struct Service<D: Data> {
db: D,
@@ -36,8 +38,6 @@ impl Service<_> {
device_id: &DeviceId,
auth: &IncomingAuthData,
uiaainfo: &UiaaInfo,
users: &super::users::Users,
globals: &super::globals::Globals,
) -> Result<(bool, UiaaInfo)> {
let mut uiaainfo = auth
.session()
@@ -66,13 +66,13 @@ impl Service<_> {
};
let user_id =
UserId::parse_with_server_name(username.clone(), globals.server_name())
UserId::parse_with_server_name(username.clone(), SERVICE.globals.server_name())
.map_err(|_| {
Error::BadRequest(ErrorKind::InvalidParam, "User ID is invalid.")
})?;
// Check if password is correct
if let Some(hash) = users.password_hash(&user_id)? {
if let Some(hash) = SERVICE.users.password_hash(&user_id)? {
let hash_matches =
argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);