From aab60dcc114b8c014eea01de2c0c6dcdd211aa65 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Thu, 21 Apr 2022 21:51:57 +0200 Subject: [PATCH] Fixes 3 potential panics when querying the user and pwd table. --- backend/src/schema.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/schema.rs b/backend/src/schema.rs index 613ae2a..1cf0a77 100644 --- a/backend/src/schema.rs +++ b/backend/src/schema.rs @@ -147,18 +147,18 @@ pub async fn login(conn: DbConn, login: Login) -> Result id[0], + Ok(id) => id, Err(error) => return Err(DatabaseError::Query(error.to_string())), }; let pwd: String = match pwd::table .filter(pwd::user_id.eq(id)) .select(pwd::password) - .get_results::(c) + .first(c) { - Ok(pwd) => pwd[0].clone(), + Ok(pwd) => pwd, Err(error) => return Err(DatabaseError::Query(error.to_string())), }; @@ -174,9 +174,9 @@ pub async fn login(conn: DbConn, login: Login) -> Result(c) + .first(c) { - Ok(role) => role[0].clone(), + Ok(role) => role, Err(error) => return Err(DatabaseError::Query(error.to_string())), };