From 519778effc34ef797c88c1be5d64f7ddd58dee99 Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Thu, 11 May 2023 10:33:28 -0400 Subject: [PATCH 1/2] Added property for disabling auth --- src/main/resources/brapi/properties/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/brapi/properties/application.properties b/src/main/resources/brapi/properties/application.properties index 1e030a284..48d433aa4 100644 --- a/src/main/resources/brapi/properties/application.properties +++ b/src/main/resources/brapi/properties/application.properties @@ -30,4 +30,5 @@ spring.jpa.show-sql=false spring.mvc.dispatch-options-request=true -security.oidc_discovery_url=https://example.com/auth/.well-known/openid-configuration \ No newline at end of file +security.oidc_discovery_url=https://example.com/auth/.well-known/openid-configuration +security.enabled=false \ No newline at end of file From ec6527af77377e060399db103f96ffbcc52e79a5 Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Mon, 5 Jun 2023 16:25:30 -0400 Subject: [PATCH 2/2] Fix unknown germplasm working with brapi server ids --- .../java/org/breedinginsight/brapi/v2/GermplasmController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/breedinginsight/brapi/v2/GermplasmController.java b/src/main/java/org/breedinginsight/brapi/v2/GermplasmController.java index 78f65ab47..d91f4ed57 100644 --- a/src/main/java/org/breedinginsight/brapi/v2/GermplasmController.java +++ b/src/main/java/org/breedinginsight/brapi/v2/GermplasmController.java @@ -278,7 +278,7 @@ public HttpResponse getGermplasmProgenyInfo( returnNode.setGermplasmName("Unknown [-0]"); ArrayList progeny = new ArrayList<>(); BrAPIProgenyNodeProgeny singleProgeny = new BrAPIProgenyNodeProgeny(); - singleProgeny.setGermplasmDbId(germplasmId.split("-")[0]); + singleProgeny.setGermplasmDbId(germplasmId.split("-[FM]-Unknown")[0]); singleProgeny.setGermplasmName("Name"); //does not seem necessary, preferable to avoid longer id string/making more endpoint calls if (germplasmId.endsWith("F-Unknown")) { singleProgeny.setParentType(BrAPIParentType.FEMALE);