1 files changed, 6 insertions, 13 deletions

diff --git a/src/bin/client/connection.rs b/src/bin/client/connection.rs
index 497ed36..b07bf01 100644
--- a/src/bin/client/connection.rs
+++ b/src/bin/client/connection.rs
@@ -4,17 +4,9 @@ use std::sync::mpsc;
 use std::thread;
 use std::time::{Duration, Instant};
 use rusqlite::Connection;
-use bcrypt::hash_with_salt;
 use crate::database;
 
-const SALT: [u8; 16] = *b"fixedsalt1234567";
-
-fn hash_password(password: &str) -> String {
-    let result = hash_with_salt(password, 10, SALT).unwrap();
-    result.to_string()
-}
-
-pub fn connect(addr: &str, conn: &Connection) -> Result<TcpStream, Box<dyn std::error::Error>> {
+pub fn connect(addr: &str, conn: &Connection) -> Result<(TcpStream, Option<String>), Box<dyn std::error::Error>> {
     let (tx, rx) = mpsc::channel();
     let addr_str = addr.to_string();
     thread::spawn(move || {
@@ -36,19 +28,20 @@ pub fn connect(addr: &str, conn: &Connection) -> Result<TcpStream, Box<dyn std::
             
             // Check for credentials and auto-auth
             if let Some((username, password)) = database::get_credentials(conn, addr) {
-                let hashed = hash_password(&password);
-                let auth_msg = format!("AUTH {} {}", username, hashed);
+                let auth_msg = format!("AUTH {} {}", username, password);
                 writeln!(ping_writer, "{}", auth_msg).unwrap();
                 let mut auth_response = String::new();
                 ping_reader.read_line(&mut auth_response).unwrap();
                 if auth_response.trim().starts_with("OK") {
                     println!("Authenticated as {}", username);
+                    Ok((s, Some(username)))
                 } else {
                     println!("Authentication failed: {}", auth_response.trim());
-                    // Do not fail, allow manual login
+                    Ok((s, None))
                 }
+            } else {
+                Ok((s, None))
             }
-            Ok(s)
         }
         Ok(Err(e)) => Err(Box::new(e)),
         Err(mpsc::RecvTimeoutError::Timeout) => Err("Connection timed out after 3 seconds".into()),