diff --git a/src/main/java/com/l2/shots/auth/AuthService.java b/src/main/java/com/l2/shots/auth/AuthService.java index 64b03c0..395d94e 100644 --- a/src/main/java/com/l2/shots/auth/AuthService.java +++ b/src/main/java/com/l2/shots/auth/AuthService.java @@ -67,17 +67,9 @@ public class AuthService { @Transactional public Optional authenticate(String username, String password) { if (username == null || password == null) return Optional.empty(); - String trimmed = username.trim(); - LOG.infof("authenticate: username=%s trimmed=%s pw.len=%d", trimmed, trimmed, password.length()); - User user = User.findByUsernameCaseInsensitive(trimmed); - if (user == null) { - LOG.warnf("authenticate: user '%s' NOT FOUND in DB", trimmed); - return Optional.empty(); - } - LOG.infof("authenticate: found user id=%s hash.len=%d hash.prefix=%s", user.id, user.passwordHash == null ? -1 : user.passwordHash.length(), user.passwordHash == null ? "null" : user.passwordHash.substring(0, Math.min(7, user.passwordHash.length()))); - boolean matches = BcryptUtil.matches(password, user.passwordHash); - LOG.infof("authenticate: bcrypt.matches=%s for user=%s", matches, trimmed); - if (!matches) return Optional.empty(); + User user = User.findByUsernameCaseInsensitive(username.trim()); + if (user == null) return Optional.empty(); + if (!BcryptUtil.matches(password, user.passwordHash)) return Optional.empty(); user.lastLoginAt = Instant.now(); user.persist(); return Optional.of(user); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0a8d355..199dabd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,9 +9,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:file:./data/shots;DB_CLOSE_DELAY=-1 quarkus.datasource.username=sa quarkus.datasource.password= quarkus.hibernate-orm.database.generation=create-drop -quarkus.hibernate-orm.log.sql=true -quarkus.log.category."org.hibernate.SQL".level=DEBUG -quarkus.log.category."com.l2.shots.auth".level=DEBUG +quarkus.hibernate-orm.log.sql=false # JWT mp.jwt.verify.issuer=shot-crafter-calculator