From 701df23c1ebf26631b7bb30ae03cf756cbdd8e7a Mon Sep 17 00:00:00 2001 From: Andreas Dinauer Date: Sat, 18 Apr 2026 14:35:06 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Fix=20user=20services=20bugs=20f?= =?UTF-8?q?rom=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomHttpAuthenticationMechanism.java | 2 +- src/main/java/de/tavolio/realm/user/UserRepo.java | 12 +++++++++--- src/main/java/de/tavolio/realm/user/UserService.java | 3 +-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/tavolio/auth/httpmechanism/CustomHttpAuthenticationMechanism.java b/src/main/java/de/tavolio/auth/httpmechanism/CustomHttpAuthenticationMechanism.java index b41b2ca..2818e43 100644 --- a/src/main/java/de/tavolio/auth/httpmechanism/CustomHttpAuthenticationMechanism.java +++ b/src/main/java/de/tavolio/auth/httpmechanism/CustomHttpAuthenticationMechanism.java @@ -74,6 +74,6 @@ public class CustomHttpAuthenticationMechanism implements HttpAuthenticationMech @Override public Uni getChallenge(RoutingContext context) { - return null; + return Uni.createFrom().nullItem(); } } diff --git a/src/main/java/de/tavolio/realm/user/UserRepo.java b/src/main/java/de/tavolio/realm/user/UserRepo.java index 7e5a42f..6c20ab1 100644 --- a/src/main/java/de/tavolio/realm/user/UserRepo.java +++ b/src/main/java/de/tavolio/realm/user/UserRepo.java @@ -6,6 +6,7 @@ import io.quarkus.panache.common.Parameters; import jakarta.enterprise.context.ApplicationScoped; import java.util.List; +import java.util.Map; import java.util.Optional; @ApplicationScoped @@ -13,16 +14,21 @@ public class UserRepo implements PanacheRepositoryBase { public Optional findOptionalByRealmAndEmail(RealmEntity realm, String email) { - return find("realm = :realm AND email = :email", Parameters.with("realm", realm).and("email", email)).firstResultOptional(); + return find("realm = :realm AND email = :email", Map.ofEntries(Map.entry("realm", realm), Map.entry("email", email))).firstResultOptional(); } public List findByRealm(RealmEntity realm) { - return list("realm = :realm", Parameters.with("realm", realm)); + return list("realm = :realm", Map.ofEntries(Map.entry("realm", realm))); } public UserEntity findByRealmAndId(RealmEntity realm, String id) { - return find("realm = :realm AND id = :id", Parameters.with("realm", realm).and("id", id)).firstResult(); + return find("realm = :realm AND id = :id", Map.ofEntries(Map.entry("realm", realm), Map.entry("id", id))).firstResult(); + } + + public List searchByIds(List ids) + { + return list("id IN :ids", Map.ofEntries(Map.entry("ids", ids))); } } diff --git a/src/main/java/de/tavolio/realm/user/UserService.java b/src/main/java/de/tavolio/realm/user/UserService.java index 7e2872c..8e71d4c 100644 --- a/src/main/java/de/tavolio/realm/user/UserService.java +++ b/src/main/java/de/tavolio/realm/user/UserService.java @@ -68,8 +68,7 @@ public class UserService public Map findByIds(List ids) { Map accounts = new HashMap<>(); - List users = userRepo.findByIds(ids); - for (UserEntity userEntity : users) + for (UserEntity userEntity : userRepo.searchByIds(ids)) { accounts.put(userEntity.getId(), userMapper.map(userEntity)); }