Restructure full_register arguments with names and defaults.
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
@@ -2,19 +2,18 @@ use std::fmt::Write;
|
||||
|
||||
use axum::extract::State;
|
||||
use axum_client_ip::InsecureClientIp;
|
||||
use register::RegistrationKind;
|
||||
use ruma::{
|
||||
UserId,
|
||||
api::client::{
|
||||
account::{
|
||||
check_registration_token_validity, get_username_availability,
|
||||
register::{self, LoginType},
|
||||
register::{self, LoginType, RegistrationKind},
|
||||
},
|
||||
uiaa::{AuthFlow, AuthType, UiaaInfo},
|
||||
},
|
||||
};
|
||||
use tuwunel_core::{Err, Error, Result, debug_info, debug_warn, info, utils};
|
||||
use tuwunel_service::users::device::generate_refresh_token;
|
||||
use tuwunel_service::users::{Register, device::generate_refresh_token};
|
||||
|
||||
use super::SESSION_ID_LENGTH;
|
||||
use crate::Ruma;
|
||||
@@ -337,7 +336,14 @@ pub(crate) async fn register_route(
|
||||
|
||||
services
|
||||
.users
|
||||
.full_register(&user_id, password, None, body.appservice_info.as_ref(), is_guest, true)
|
||||
.full_register(Register {
|
||||
user_id: Some(&user_id),
|
||||
password,
|
||||
appservice_info: body.appservice_info.as_ref(),
|
||||
is_guest,
|
||||
grant_first_user_admin: true,
|
||||
..Default::default()
|
||||
})
|
||||
.await?;
|
||||
|
||||
if (!is_guest && body.inhibit_login)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use futures::FutureExt;
|
||||
use ruma::{OwnedUserId, UserId};
|
||||
use tuwunel_core::{Err, Result, debug};
|
||||
use tuwunel_service::Services;
|
||||
use tuwunel_service::{Services, users::Register};
|
||||
|
||||
use super::password_login;
|
||||
|
||||
@@ -51,7 +51,12 @@ pub(super) async fn ldap_login(
|
||||
if !services.users.exists(lowercased_user_id).await {
|
||||
services
|
||||
.users
|
||||
.full_register(lowercased_user_id, Some("*"), Some("ldap"), None, false, false)
|
||||
.full_register(Register {
|
||||
user_id: Some(lowercased_user_id),
|
||||
password: Some("*"),
|
||||
origin: Some("ldap"),
|
||||
..Default::default()
|
||||
})
|
||||
.await?;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user