Compare commits

...

3 Commits

3 changed files with 14 additions and 12 deletions

View File

@ -71,7 +71,9 @@ pub async fn login(
let req = request.into_inner();
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)
{
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 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)
}) {
return None;
return Some(existing.clone());
}
game.title = game.title.trim().to_string();
games.push(game.clone());
games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title));

View File

@ -13,7 +13,7 @@ importers:
dependencies:
'@bufbuild/protobuf':
specifier: ^2.10.1
version: 2.10.1
version: 2.10.2
react:
specifier: ^19.2.1
version: 19.2.1
@ -149,8 +149,8 @@ packages:
resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==}
engines: {node: '>=6.9.0'}
'@bufbuild/protobuf@2.10.1':
resolution: {integrity: sha512-ckS3+vyJb5qGpEYv/s1OebUHDi/xSNtfgw1wqKZo7MR9F2z+qXr0q5XagafAG/9O0QPVIUfST0smluYSTpYFkg==}
'@bufbuild/protobuf@2.10.2':
resolution: {integrity: sha512-uFsRXwIGyu+r6AMdz+XijIIZJYpoWeYzILt5yZ2d3mCjQrWUTVpVD9WL/jZAbvp+Ed04rOhrsk7FiTcEDseB5A==}
'@emnapi/core@1.7.1':
resolution: {integrity: sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==}
@ -425,7 +425,7 @@ packages:
resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==}
engines: {node: ^20.19.0 || >=22.12.0}
peerDependencies:
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
vite: npm:rolldown-vite@7.2.5
acorn-jsx@5.3.2:
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
@ -1167,7 +1167,7 @@ snapshots:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.28.5
'@bufbuild/protobuf@2.10.1': {}
'@bufbuild/protobuf@2.10.2': {}
'@emnapi/core@1.7.1':
dependencies:
@ -1940,11 +1940,11 @@ snapshots:
ts-proto-descriptors@2.0.0:
dependencies:
'@bufbuild/protobuf': 2.10.1
'@bufbuild/protobuf': 2.10.2
ts-proto@2.8.3:
dependencies:
'@bufbuild/protobuf': 2.10.1
'@bufbuild/protobuf': 2.10.2
case-anything: 2.1.13
ts-poet: 6.12.0
ts-proto-descriptors: 2.0.0