Split login case bodies into handlers.

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/client/session/token.rs

@@ -2,13 +2,36 @@ use std::time::Duration;
 
 use axum::extract::State;
 use axum_client_ip::InsecureClientIp;
-use ruma::api::client::{session::get_login_token, uiaa};
-use tuwunel_core::{Err, Error, Result, utils};
-use tuwunel_service::uiaa::SESSION_ID_LENGTH;
+use ruma::{
+	OwnedUserId,
+	api::client::{
+		session::{
+			get_login_token,
+			login::v3::{Request, Token},
+		},
+		uiaa,
+	},
+};
+use tuwunel_core::{Err, Result, utils::random_string};
+use tuwunel_service::{Services, uiaa::SESSION_ID_LENGTH};
 
 use super::TOKEN_LENGTH;
 use crate::Ruma;
 
+pub(super) async fn handle_login(
+	services: &Services,
+	_body: &Ruma<Request>,
+	info: &Token,
+) -> Result<OwnedUserId> {
+	let Token { token } = info;
+
+	if !services.config.login_via_existing_session {
+		return Err!(Request(Unknown("Token login is not enabled.")));
+	}
+
+	services.users.find_from_login_token(token).await
+}
+
 /// # `POST /_matrix/client/v1/login/get_token`
 ///
 /// Allows a logged-in user to get a short-lived token which can be used
@@ -21,7 +44,7 @@ pub(crate) async fn login_token_route(
 	InsecureClientIp(client): InsecureClientIp,
 	body: Ruma<get_login_token::v1::Request>,
 ) -> Result<get_login_token::v1::Response> {
-	if !services.server.config.login_via_existing_session {
+	if !services.config.login_via_existing_session {
 		return Err!(Request(Forbidden("Login via an existing session is not enabled")));
 	}
 
@@ -29,8 +52,10 @@ pub(crate) async fn login_token_route(
 	// TODO: How do we make only UIA sessions that have not been used before valid?
 	let (sender_user, sender_device) = body.sender();
 
+	let password_flow = uiaa::AuthFlow { stages: vec![uiaa::AuthType::Password] };
+
 	let mut uiaainfo = uiaa::UiaaInfo {
-		flows: vec![uiaa::AuthFlow { stages: vec![uiaa::AuthType::Password] }],
+		flows: vec![password_flow],
 		completed: Vec::new(),
 		params: Box::default(),
 		session: None,
@@ -45,27 +70,25 @@ pub(crate) async fn login_token_route(
 				.await?;
 
 			if !worked {
-				return Err(Error::Uiaa(uiaainfo));
+				return Err!(Uiaa(uiaainfo));
 			}
 
 			// Success!
 		},
 		| _ => match body.json_body.as_ref() {
 			| Some(json) => {
-				uiaainfo.session = Some(utils::random_string(SESSION_ID_LENGTH));
+				uiaainfo.session = Some(random_string(SESSION_ID_LENGTH));
 				services
 					.uiaa
 					.create(sender_user, sender_device, &uiaainfo, json);
 
-				return Err(Error::Uiaa(uiaainfo));
-			},
-			| _ => {
-				return Err!(Request(NotJson("No JSON body was sent when required.")));
+				return Err!(Uiaa(uiaainfo));
 			},
+			| _ => return Err!(Request(NotJson("No JSON body was sent when required."))),
 		},
 	}
 
-	let login_token = utils::random_string(TOKEN_LENGTH);
+	let login_token = random_string(TOKEN_LENGTH);
 	let expires_in = services
 		.users
 		.create_login_token(sender_user, &login_token);