backups/grapevine
1
0
Fork 0
mirror of https://gitlab.computer.surgery/matrix/grapevine.git synced 2025-12-17 07:41:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix api/client_server/session events

Browse source 
And also add a new event for logging out to match the one for logging in
because why not.
This commit is contained in:
Charles Hall 2024-07-15 17:56:43 -07:00
parent 0aef00c58b
commit 60b89aba78
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/api/client_server/session.rs
View file

@ -79,7 +79,7 @@ pub(crate) async fn login_route(
} else if let Some(user) = user { } else if let Some(user) = user {
UserId::parse(user) UserId::parse(user)
} else { } else {
warn!("Bad login type: {:?}", &body.login_info); warn!(kind = ?body.login_info, "Bad login kind");
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::forbidden(), ErrorKind::forbidden(),
"Bad login type.", "Bad login type.",
@ -184,7 +184,7 @@ pub(crate) async fn login_route(
} else if let Some(user) = user { } else if let Some(user) = user {
UserId::parse(user) UserId::parse(user)
} else { } else {
warn!("Bad login type: {:?}", &body.login_info); warn!(kind = ?body.login_info, "Bad login kind");
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::forbidden(), ErrorKind::forbidden(),
"Bad login type.", "Bad login type.",
@ -214,7 +214,7 @@ pub(crate) async fn login_route(
user_id user_id
} }
_ => { _ => {
warn!("Unsupported or unknown login type: {:?}", &body.login_info); warn!(kind = ?body.login_info, "Unsupported or unknown login kind");
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Unknown, ErrorKind::Unknown,
"Unsupported login type.", "Unsupported login type.",
@ -250,7 +250,7 @@ pub(crate) async fn login_route(
)?; )?;
} }
info!("{} logged in", user_id); info!(%user_id, %device_id, "User logged in");
// Homeservers are still required to send the `home_server` field // Homeservers are still required to send the `home_server` field
#[allow(deprecated)] #[allow(deprecated)]
@ -292,6 +292,8 @@ pub(crate) async fn logout_route(
services().users.remove_device(sender_user, sender_device)?; services().users.remove_device(sender_user, sender_device)?;
info!(user_id = %sender_user, device_id = %sender_device, "User logged out");
Ok(Ra(logout::v3::Response::new())) Ok(Ra(logout::v3::Response::new()))
} }