Skip to content

BI-1781 #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickpalladino merged 2 commits into from
Jun 30, 2023
Merged

BI-1781 #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519778e
Added property for disabling auth
nickpalladino May 11, 2023
ec6527a
Fix unknown germplasm working with brapi server ids
nickpalladino Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/breedinginsight/brapi/v2/GermplasmController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public HttpResponse<BrAPIGermplasmProgenyResponse> getGermplasmProgenyInfo(
returnNode.setGermplasmName("Unknown [-0]");
ArrayList<BrAPIProgenyNodeProgeny> 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);
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/brapi/properties/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
security.oidc_discovery_url=https://example.com/auth/.well-known/openid-configuration
security.enabled=false