Refactor join, alias services

Split knock, user register from api into services

Fix autojoin not working with v12 rooms

Fix 'm.login.registration_token/validity' for reloaded registration tokens

Change join servers order

Move autojoin for ldap

src/api/client/session/ldap.rs

@@ -1,6 +1,6 @@
 use futures::FutureExt;
 use ruma::{OwnedUserId, UserId};
-use tuwunel_core::{Err, Result, debug, error, info, warn};
+use tuwunel_core::{Err, Result, debug};
 use tuwunel_service::Services;
 
 use super::password_login;
@@ -51,69 +51,8 @@ pub(super) async fn ldap_login(
 	if !services.users.exists(lowercased_user_id).await {
 		services
 			.users
-			.create(lowercased_user_id, Some("*"), Some("ldap"))
+			.full_register(lowercased_user_id, Some("*"), Some("ldap"), None, false, false)
 			.await?;
-
-		// Auto-join rooms for newly created LDAP users
-		if !services.server.config.auto_join_rooms.is_empty() {
-			for room in &services.server.config.auto_join_rooms {
-				let Ok(room_id) = services.alias.maybe_resolve(room).await else {
-					error!(
-						"Failed to resolve room alias to room ID when attempting to auto join \
-						 {room}, skipping"
-					);
-					continue;
-				};
-
-				if !services
-					.state_cache
-					.server_in_room(services.globals.server_name(), &room_id)
-					.await
-				{
-					warn!(
-						"Skipping room {room} to automatically join as we have never joined \
-						 before."
-					);
-					continue;
-				}
-
-				if let Some(room_server_name) = room.server_name() {
-					let state_lock = services.state.mutex.lock(&room_id).await;
-
-					match services
-						.membership
-						.join(
-							lowercased_user_id,
-							&room_id,
-							Some("Automatically joining this room upon first login".to_owned()),
-							&[
-								services.globals.server_name().to_owned(),
-								room_server_name.to_owned(),
-							],
-							&None,
-							&state_lock,
-						)
-						.boxed()
-						.await
-					{
-						| Err(e) => {
-							// don't return this error so we don't fail logins
-							error!(
-								"Failed to automatically join room {room} for user \
-								 {lowercased_user_id}: {e}"
-							);
-						},
-						| _ => {
-							info!(
-								"Automatically joined room {room} for user {lowercased_user_id}"
-							);
-						},
-					}
-
-					drop(state_lock);
-				}
-			}
-		}
 	}
 
 	let is_tuwunel_admin = services

src/api/client/session/mod.rs

@@ -21,7 +21,7 @@ use ruma::api::client::session::{
 		v3::{DiscoveryInfo, HomeserverInfo, LoginInfo},
 	},
 };
-use tuwunel_core::{Err, Result, info, utils, utils::stream::ReadyExt};
+use tuwunel_core::{Err, Result, info, utils::stream::ReadyExt};
 use tuwunel_service::users::device::generate_refresh_token;
 
 use self::{ldap::ldap_login, password::password_login};
@@ -30,7 +30,7 @@ pub(crate) use self::{
 	refresh::refresh_token_route,
 	token::login_token_route,
 };
-use super::{DEVICE_ID_LENGTH, TOKEN_LENGTH};
+use super::TOKEN_LENGTH;
 use crate::Ruma;
 
 /// # `GET /_matrix/client/v3/login`
@@ -97,43 +97,39 @@ pub(crate) async fn login_route(
 	// Generate a new refresh_token if requested by client
 	let refresh_token = expires_in.is_some().then(generate_refresh_token);
 
-	// Generate new device id if the user didn't specify one
-	let device_id = body
-		.device_id
-		.clone()
-		.unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
-
 	// Determine if device_id was provided and exists in the db for this user
-	let device_exists = services
-		.users
-		.all_device_ids(&user_id)
-		.ready_any(|v| v == device_id)
-		.await;
-
-	if !device_exists {
-		services
+	let device_id = if let Some(device_id) = &body.device_id
+		&& services
 			.users
-			.create_device(
-				&user_id,
-				&device_id,
-				(Some(&access_token), expires_in),
-				refresh_token.as_deref(),
-				body.initial_device_display_name.clone(),
-				Some(client.to_string()),
-			)
-			.await?;
-	} else {
+			.all_device_ids(&user_id)
+			.ready_any(|v| v == device_id)
+			.await
+	{
 		services
 			.users
 			.set_access_token(
 				&user_id,
-				&device_id,
+				device_id,
 				&access_token,
 				expires_in,
 				refresh_token.as_deref(),
 			)
 			.await?;
-	}
+
+		device_id.clone()
+	} else {
+		services
+			.users
+			.create_device(
+				&user_id,
+				body.device_id.as_deref(),
+				(Some(&access_token), expires_in),
+				refresh_token.as_deref(),
+				body.initial_device_display_name.as_deref(),
+				Some(client.to_string()),
+			)
+			.await?
+	};
 
 	info!("{user_id} logged in");