From dc8708323843d54e17b07b0b3e115a2d1875581c Mon Sep 17 00:00:00 2001 From: gcolon021 Date: Mon, 7 Aug 2023 11:54:02 -0400 Subject: [PATCH] [ALS-4793] Add logging. Minor refactor. --- .../dbmi/avillach/auth/data/repository/UserRepository.java | 5 +++++ .../edu/harvard/hms/dbmi/avillach/auth/utils/AuthUtils.java | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java index d322c29e3..55cbccb6e 100644 --- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java +++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/data/repository/UserRepository.java @@ -192,6 +192,11 @@ public User createOpenAccessUser() { result.setEmail(user.getUuid() + "@open_access.com"); em().merge(result); + logger.info("createOpenAccessUser() created user, uuid: " + result.getUuid() + + ", subject: " + result.getSubject() + + ", role: " + result.getRoleString() + + ", privilege: "+ result.getPrivilegeString() + + ", email: " + result.getEmail()); return result; } } diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/utils/AuthUtils.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/utils/AuthUtils.java index 474388543..48bb53213 100644 --- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/utils/AuthUtils.java +++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/utils/AuthUtils.java @@ -106,10 +106,9 @@ public HashMap getUserProfileResponse(Map claims logger.debug("getUserProfileResponse() acceptedTOS is set"); - boolean acceptedTOS = JAXRSConfiguration.tosEnabled.startsWith("true") ? - tosService.getLatest() == null || tosService.hasUserAcceptedLatest(claims.get("subject").toString()) : true; + boolean acceptedTOS = !JAXRSConfiguration.tosEnabled.startsWith("true") || tosService.getLatest() == null || tosService.hasUserAcceptedLatest(claims.get("subject").toString()); - responseMap.put("acceptedTOS", ""+acceptedTOS); + responseMap.put("acceptedTOS", String.valueOf(acceptedTOS)); logger.debug("getUserProfileResponse() expirationDate is set"); Date expirationDate = new Date(Calendar.getInstance().getTimeInMillis() + JAXRSConfiguration.tokenExpirationTime);