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/service/globals/mod.rs

@@ -1,6 +1,6 @@
 mod data;
 
-use std::{ops::Range, sync::Arc};
+use std::{collections::HashSet, ops::Range, sync::Arc};
 
 use data::Data;
 use ruma::{OwnedUserId, RoomAliasId, ServerName, UserId};
@@ -13,8 +13,7 @@ pub struct Service {
 	server: Arc<Server>,
 
 	pub server_user: OwnedUserId,
-	pub turn_secret: String,
-	pub registration_token: Option<String>,
+	pub turn_secret: Option<String>,
 }
 
 impl crate::Service for Service {
@@ -22,32 +21,17 @@ impl crate::Service for Service {
 		let db = Data::new(args);
 		let config = &args.server.config;
 
-		let turn_secret = config.turn_secret_file.as_ref().map_or_else(
-			|| config.turn_secret.clone(),
-			|path| {
-				std::fs::read_to_string(path).unwrap_or_else(|e| {
-					error!("Failed to read the TURN secret file: {e}");
-
-					config.turn_secret.clone()
-				})
-			},
-		);
-
-		let registration_token = config
-			.registration_token_file
+		let turn_secret = config
+			.turn_secret_file
 			.as_ref()
-			.map_or_else(
-				|| config.registration_token.clone(),
-				|path| {
-					let Ok(token) = std::fs::read_to_string(path).inspect_err(|e| {
-						error!("Failed to read the registration token file: {e}");
-					}) else {
-						return config.registration_token.clone();
-					};
-
-					Some(token)
-				},
-			);
+			.and_then(|path| {
+				std::fs::read_to_string(path)
+					.inspect_err(|e| {
+						error!("Failed to read the TURN secret file: {e}");
+					})
+					.ok()
+			})
+			.or_else(|| config.turn_secret.clone());
 
 		Ok(Arc::new(Self {
 			db,
@@ -58,7 +42,6 @@ impl crate::Service for Service {
 			)
 			.expect("@conduit:server_name is valid"),
 			turn_secret,
-			registration_token,
 		}))
 	}
 
@@ -122,4 +105,29 @@ impl Service {
 	#[inline]
 	#[must_use]
 	pub fn is_read_only(&self) -> bool { self.db.db.is_read_only() }
+
+	pub async fn get_registration_tokens(&self) -> HashSet<String> {
+		let mut tokens = HashSet::new();
+		if let Some(file) = &self
+			.server
+			.config
+			.registration_token_file
+			.as_ref()
+		{
+			match std::fs::read_to_string(file) {
+				| Err(e) => error!("Failed to read the registration token file: {e}"),
+				| Ok(text) => {
+					text.split_ascii_whitespace().for_each(|token| {
+						tokens.insert(token.to_owned());
+					});
+				},
+			}
+		}
+
+		if let Some(token) = &self.server.config.registration_token {
+			tokens.insert(token.to_owned());
+		}
+
+		tokens
+	}
 }