MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-28 18:54:41 +01:00
Code Issues Releases Activity

improvement: Handle optional device_id field during login

Browse source 
remove debug logging
This commit is contained in:
Devon Hudson 2021-01-16 22:15:45 -07:00
parent 9424ba0559
commit 890187e004
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/client_server/session.rs
View file

@ -77,7 +77,6 @@ pub async fn login_route(
// Generate new device id if the user didn't specify one
let device_id = body
.body
.device_id
.clone()
.unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH).into());
@ -85,14 +84,32 @@ pub async fn login_route(
// Generate a new token for the device
let token = utils::random_string(TOKEN_LENGTH);
// TODO: Don't always create a new device
// Add device
db.users.create_device(
&user_id,
&device_id,
&token,
body.initial_device_display_name.clone(),
)?;
let mut create_new_device = true;
// Only search db for existing device if one was provided in the request
match &body.device_id {
Some(_) => {
// Look to see if provided device_id already exists
if let Some(_) = db.users.all_device_ids(&user_id).find(|x| match x {
Ok(x) if **x == *device_id => true,
_ => false,
}) {
// Replace token for existing device
db.users.set_token(&user_id, &device_id, &token)?;
create_new_device = false;
}
}
_ => (),
};
if create_new_device {
db.users.create_device(
&user_id,
&device_id,
&token,
body.initial_device_display_name.clone(),
)?;
}
info!("{} logged in", user_id);

2
src/database/users.rs
View file

@ -251,7 +251,7 @@ impl Users {
}
/// Replaces the access token of one device.
fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()> {
pub fn set_token(&self, user_id: &UserId, device_id: &DeviceId, token: &str) -> Result<()> {
let mut userdeviceid = user_id.to_string().as_bytes().to_vec();
userdeviceid.push(0xff);
userdeviceid.extend_from_slice(device_id.as_bytes());