use proper result for finding user

src/model/user.rs

@@ -22,7 +22,6 @@ pub struct User {
 
 #[derive(Debug)]
 pub enum LoginError {
-    SqlxError(sqlx::Error),
     InvalidAuthenticationCombo,
     NotLoggedIn,
     NotAnAdmin,
@@ -30,11 +29,6 @@ pub enum LoginError {
     NoPasswordSet(User),
 }
 
-impl From<sqlx::Error> for LoginError {
-    fn from(sqlx_error: sqlx::Error) -> Self {
-        Self::SqlxError(sqlx_error)
-    }
-}
 impl User {
     pub async fn update(&self, db: &SqlitePool, is_cox: bool, is_admin: bool, is_guest: bool) {
         sqlx::query!(
@@ -60,36 +54,38 @@ impl User {
         .is_ok()
     }
 
-    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Result<Self, sqlx::Error> {
-        let user: User = sqlx::query_as!(
-            User,
-            "
+    pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
+        Some(
+            sqlx::query_as!(
+                User,
+                "
 SELECT id, name, pw, is_cox, is_admin, is_guest
 FROM user 
 WHERE id like ?
         ",
-            id
+                id
+            )
+            .fetch_one(db)
+            .await
+            .ok()?,
         )
-        .fetch_one(db)
-        .await?;
-
-        Ok(user)
     }
 
-    async fn find_by_name(db: &SqlitePool, name: String) -> Result<Self, sqlx::Error> {
-        let user: User = sqlx::query_as!(
-            User,
-            "
+    async fn find_by_name(db: &SqlitePool, name: String) -> Option<Self> {
+        Some(
+            sqlx::query_as!(
+                User,
+                "
 SELECT id, name, pw, is_cox, is_admin, is_guest
 FROM user 
 WHERE name like ?
         ",
-            name
+                name
+            )
+            .fetch_one(db)
+            .await
+            .ok()?,
         )
-        .fetch_one(db)
-        .await?;
-
-        Ok(user)
     }
 
     fn get_hashed_pw(pw: &str) -> String {
@@ -102,7 +98,12 @@ WHERE name like ?
     }
 
     pub async fn login(db: &SqlitePool, name: String, pw: String) -> Result<Self, LoginError> {
-        let user = User::find_by_name(db, name).await?;
+        let user = match User::find_by_name(db, name).await {
+            Some(user) => user,
+            None => {
+                return Err(LoginError::InvalidAuthenticationCombo); // Username not found
+            }
+        };
 
         match user.pw.clone() {
             Some(user_pw) => {

src/rest/admin/user.rs

@@ -21,14 +21,14 @@ async fn index(db: &State<SqlitePool>, admin: AdminUser) -> Template {
 async fn resetpw(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<Redirect> {
     let user = User::find_by_id(db, user).await;
     match user {
-        Ok(user) => {
+        Some(user) => {
             user.reset_pw(db).await;
             Flash::success(
                 Redirect::to("/admin/user"),
                 format!("Successfully reset pw of {}", user.name),
             )
         }
-        Err(_) => Flash::error(Redirect::to("/admin/user"), "User does not exist"),
+        None => Flash::error(Redirect::to("/admin/user"), "User does not exist"),
     }
 }
 
@@ -47,7 +47,7 @@ async fn update(
     _admin: AdminUser,
 ) -> Flash<Redirect> {
     let user = User::find_by_id(db, data.id).await;
-    let Ok(user) = user else {
+    let Some(user) = user else {
             return Flash::error(
                 Redirect::to("/admin/user"),
                 format!("User with ID {} does not exist!", data.id),

src/rest/auth.rs

@@ -77,7 +77,7 @@ async fn updatepw(
     cookies: &CookieJar<'_>,
 ) -> Flash<Redirect> {
     let user = User::find_by_id(db, updatepw.userid).await;
-    let Ok(user) = user else{
+    let Some(user) = user else{
             return Flash::error(
                 Redirect::to("/auth"),
                 format!("User with ID {} does not exist!", updatepw.userid),