From c3fec3c448abc884148b5261c2f4a5ac7f02c32f Mon Sep 17 00:00:00 2001 From: Sotatek-PhucNguyen5 Date: Tue, 10 Oct 2023 15:22:48 +0700 Subject: [PATCH] fix: bug testing --- .../service/impl/KeycloakServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cardanofoundation/authentication/service/impl/KeycloakServiceImpl.java b/src/main/java/org/cardanofoundation/authentication/service/impl/KeycloakServiceImpl.java index 9d31c3ed..cc3c6637 100644 --- a/src/main/java/org/cardanofoundation/authentication/service/impl/KeycloakServiceImpl.java +++ b/src/main/java/org/cardanofoundation/authentication/service/impl/KeycloakServiceImpl.java @@ -54,7 +54,12 @@ public Boolean roleMapping(EventModel model) { if (resourceType.equals(EResourceType.REALM_ROLE.name())) { log.info("role id: " + resourceArr[1]); Set userPrefixKeys = new HashSet<>(); - keys.forEach(key -> userPrefixKeys.add(redisProvider.getValue(key))); + keys.forEach(key -> { + String val = redisProvider.getValue(key); + if (Objects.nonNull(val)) { + userPrefixKeys.add(val); + } + }); Set userKeys = new HashSet<>(); userPrefixKeys.forEach( userPrefixKey -> userKeys.addAll(redisProvider.getKeys(userPrefixKey + "*"))); @@ -70,9 +75,11 @@ public Boolean roleMapping(EventModel model) { private void setInValidToken(Set keys) { keys.forEach(key -> { String val = redisProvider.getValue(key); - redisProvider.blacklistJwt(val, key); - redisProvider.remove(key); - log.info("black list: " + key); + if (Objects.nonNull(val)) { + redisProvider.blacklistJwt(val, key); + redisProvider.remove(key); + log.info("black list: " + key); + } }); } }