diff --git a/pom.xml b/pom.xml index a4d61b5..c82d84c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,15 +11,15 @@ com.uci orchestrator - 2.4.1 + 2.4.2 orchestrator Demo project for Spring Boot 11 - 2.4.0 - 2.4.0 - 2.4.0 + 2.4.1 + 2.4.1 + 2.4.1 diff --git a/src/main/java/com/uci/orchestrator/Service/CommonService.java b/src/main/java/com/uci/orchestrator/Service/CommonService.java index 1f2cede..4cefab9 100644 --- a/src/main/java/com/uci/orchestrator/Service/CommonService.java +++ b/src/main/java/com/uci/orchestrator/Service/CommonService.java @@ -343,7 +343,14 @@ public Mono apply(Pair result) { from.setEncryptedDeviceID(deviceID); xmsg.setFrom(from); ClientResponse response = botService.fusionAuthClient.retrieveUserByUsername(deviceID); - if (response.wasSuccessful() && isUserRegistered(response, appID)) { + boolean wasSuccessful = response.wasSuccessful(); + boolean isUserRegistered = false; + if (wasSuccessful) { + isUserRegistered = isUserRegistered(response, appID); + } + log.info("CommonService::UpdateUser: response.wasSuccessful: " + wasSuccessful); + log.info("CommonService::UpdateUser: isUserRegistered: " + isUserRegistered); + if (wasSuccessful && isUserRegistered) { redisCacheService.setFAUserIDForAppCache(getFACacheName(deviceID, appID), response.successResponse.user.id.toString()); return Mono.just(xmsg); } else { @@ -384,8 +391,14 @@ private String getFAUserIdForApp(String deviceID, UUID appID) { if (userID == null || userID.isEmpty()) { ClientResponse response = botService.fusionAuthClient.retrieveUserByUsername(deviceID); - - if (response.wasSuccessful() && isUserRegistered(response, appID)) { + boolean wasSuccessful = response.wasSuccessful(); + boolean isUserRegistered = false; + if (wasSuccessful) { + wasSuccessful = isUserRegistered(response, appID); + } + log.info("CommonService::UpdateUser: response.wasSuccessful: " + wasSuccessful); + log.info("CommonService::UpdateUser: isUserRegistered: " + isUserRegistered); + if (wasSuccessful && isUserRegistered) { userID = response.successResponse.user.id.toString(); redisCacheService.setFAUserIDForAppCache(getFACacheName(deviceID, appID), userID); }