diff --git a/pic-sure-auth-services/pom.xml b/pic-sure-auth-services/pom.xml index 6b29c1198..c0e1219e8 100644 --- a/pic-sure-auth-services/pom.xml +++ b/pic-sure-auth-services/pom.xml @@ -32,7 +32,7 @@ org.apache.httpcomponents httpclient - 4.5.6 + 4.5.14 io.jsonwebtoken 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 9e7f9d3d9..6fb59d38e 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 @@ -514,11 +514,18 @@ private Privilege upsertClinicalPrivilege(String studyIdentifier, String project +"\":[\"" +studyIdentifierField +"\"]}," - +"\"numericFilters\":{},\"requiredFields\":[]," - +"\"fields\":[\"" + parentAccessionField + "\"]," - +"\"variantInfoFilters\":[{\"categoryVariantInfoFilters\":{},\"numericVariantInfoFilters\":{}}]," + +"\"numericFilters\":{},\"requiredFields\":[],"; + + if("fence".equalsIgnoreCase(JAXRSConfiguration.idp_provider)) { + queryTemplateText += "\"fields\":[\"" + parentAccessionField + "\"],"; + } else { + queryTemplateText += "\"fields\":[],"; + } + + queryTemplateText+="\"variantInfoFilters\":[{\"categoryVariantInfoFilters\":{},\"numericVariantInfoFilters\":{}}]," +"\"expectedResultType\": \"COUNT\"" +"}"; + priv.setQueryTemplate(queryTemplateText); if(isHarmonized) { priv.setQueryScope("[\"" + conceptPath + "\",\"_\",\"" + fence_harmonized_concept_path + "\"]");