From 9c82906846472b8a6fee81e0621345f2f8f4b2d5 Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 16 Apr 2026 14:50:01 +0200 Subject: [PATCH] Commit reversal teqniceue: QWERTYUI --- .../systemutvikling/team6/database/Readers/UserSelect.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java index d2be4db..ad79f8e 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/Readers/UserSelect.java @@ -76,7 +76,7 @@ public boolean isEmailTaken(String email){ * match is found * @throws RuntimeException if a {@link SQLException} occurs while executing the query */ - public User getUserFromDBUsernameAndPassword(String username, String password) { + public User getUserFromDBUsernameAndPassword(String email, String password) { PasswordHasher hasher = new PasswordHasher(); String hashedpassword = hasher.getHashPassword(password); @@ -93,10 +93,10 @@ public User getUserFromDBUsernameAndPassword(String username, String password) { FROM User u LEFT JOIN Settings s ON u.UUID_User = s.User_UUID_user LEFT JOIN Messages m ON u.UUID_User = m.user_id - WHERE u.user_name = ? AND u.user_password = ?; + WHERE u.user_email = ? AND u.user_password = ?; """; PreparedStatement stmt = conn.prepareStatement(sql_query); - stmt.setString(1, username); + stmt.setString(1, email); stmt.setString(2, hashedpassword); ResultSet rs = stmt.executeQuery();