char
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify device creation logic during login

next
Devon Hudson 2021-01-17 08:39:47 -07:00
parent 890187e004
commit 762255fa8d
No known key found for this signature in database
GPG Key ID: CD06B18E77F6A628
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/client_server/session.rs
View File

@ -84,25 +84,17 @@ pub async fn login_route(
// Generate a new token for the device // Generate a new token for the device
let token = utils::random_string(TOKEN_LENGTH); let token = utils::random_string(TOKEN_LENGTH);
let mut create_new_device = true; // Determine if device_id was provided and exists in the db for this user
let device_exists = body.device_id.as_ref().map_or(false, |device_id| {
db.users
.all_device_ids(&user_id)
.find(|x| x.as_ref().map_or(false, |v| v == device_id))
.is_some()
});
// Only search db for existing device if one was provided in the request if device_exists {
match &body.device_id { db.users.set_token(&user_id, &device_id, &token)?;
Some(_) => { } else {
// 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( db.users.create_device(
&user_id, &user_id,
&device_id, &device_id,