From d048def60c4b34af3c26a779f47d370172fffef1 Mon Sep 17 00:00:00 2001 From: GeorgeC Date: Fri, 7 Jun 2024 09:28:48 -0400 Subject: [PATCH] Repositioned harmonized consent path escaping logic --- .../auth/service/auth/FENCEAuthenticationService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java index a3811592..2656bc50 100644 --- a/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java +++ b/pic-sure-auth-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/auth/FENCEAuthenticationService.java @@ -202,10 +202,7 @@ public Response getFENCEProfile(String callback_url, Map authReq throw new NotAuthorizedException("The user details could not be persisted. Please contact the administrator."); } - if (fence_harmonized_concept_path != null && !fence_harmonized_concept_path.contains("\\\\")) { - fence_harmonized_concept_path = fence_harmonized_concept_path.replaceAll("\\\\", "\\\\\\\\"); - logger.debug("Escaped harmonized consent path: {}", fence_harmonized_concept_path); - } + // Update the user's roles (or create them if none exists) //Set actual_user_roles = u.getRoles(); @@ -502,6 +499,10 @@ private Privilege upsertClinicalPrivilege(String studyIdentifier, String project logger.debug("Escaped consent concept path: {}", consent_concept_path); } + if (fence_harmonized_concept_path != null && !fence_harmonized_concept_path.contains("\\\\")) { + fence_harmonized_concept_path = fence_harmonized_concept_path.replaceAll("\\\\", "\\\\\\\\"); + logger.debug("Escaped harmonized consent path: {}", fence_harmonized_concept_path); + } String studyIdentifierField = (consent_group != null && !consent_group.isEmpty()) ? studyIdentifier + "." + consent_group : studyIdentifier; String queryTemplateText = String.format(