Compare commits

...

3 Commits

3 changed files with 8 additions and 6 deletions

View File

@ -13,7 +13,7 @@ bytes = "1"
rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" } rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" }
uuid = { version = "1.19.0", features = ["v4"] } uuid = { version = "1.19.0", features = ["v4"] }
bcrypt = "0.17.1" bcrypt = "0.17.1"
bincode = "2.0.1" bincode = "3.0.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
reqwest = { version = "0.12.24", features = ["json"] } reqwest = { version = "0.12.24", features = ["json"] }

View File

@ -71,7 +71,9 @@ pub async fn login(
let req = request.into_inner(); let req = request.into_inner();
let users = user_list.lock().await; let users = user_list.lock().await;
if let Some(user) = users.iter().find(|u| u.person.name == req.username) if let Some(user) = users
.iter()
.find(|u| u.person.name.to_lowercase() == req.username.to_lowercase())
&& bcrypt::verify(&req.password, &user.password_hash).unwrap_or(false) && bcrypt::verify(&req.password, &user.password_hash).unwrap_or(false)
{ {
let token = Uuid::new_v4().to_string(); let token = Uuid::new_v4().to_string();

View File

@ -78,14 +78,14 @@ async fn add_game(
let mut games = game_list.lock().await; let mut games = game_list.lock().await;
let mut game = game.into_inner(); let mut game = game.into_inner();
if games.iter().any(|g| { game.title = game.title.trim().to_string();
if let Some(existing) = games.iter().find(|g| {
g.title == game.title || (g.remote_id == game.remote_id && g.source == game.source) g.title == game.title || (g.remote_id == game.remote_id && g.source == game.source)
}) { }) {
return None; return Some(existing.clone());
} }
game.title = game.title.trim().to_string();
games.push(game.clone()); games.push(game.clone());
games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title)); games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title));