Skip to content

Minor fix on missing pretendUser and fix on html check #211

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
NekoLyn merged 3 commits into from
Dec 3, 2025
Merged

Minor fix on missing pretendUser and fix on html check #211

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2eefbd
Minor fix on missing pretendUser and fix on html check
utas-raymondng Dec 2, 2025
c70b3f2
Rollback change on hardcode https
utas-raymondng Dec 3, 2025
3dc4cef
Rollback change on hardcode https
utas-raymondng Dec 3, 2025
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
6 changes: 3 additions & 3 deletions server/src/main/java/au/org/aodn/ogcapi/server/core/service/wms/WmsServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,15 +428,15 @@ public FeatureInfoResponse getMapFeatures(String collectionId, FeatureRequest re
List<String> urls = createMapFeatureQueryUrl(mapServerUrl.get(), collectionId, request);
// Try one by one, we exit when any works
for (String url : urls) {
ResponseEntity<String> response = restTemplateUtils.handleRedirect(url, restTemplate.getForEntity(url, String.class, Collections.emptyMap()), String.class, pretendUserEntity);
ResponseEntity<String> response = restTemplateUtils.handleRedirect(url, restTemplate.exchange(url, HttpMethod.GET, pretendUserEntity, String.class), String.class, pretendUserEntity);
if (response.getStatusCode().is2xxSuccessful()) {
// Now try to unify the return
if (MediaType.TEXT_HTML.isCompatibleWith(response.getHeaders().getContentType())) {
String html = response.getBody();
// This is a simple trick to check if the html is in fact empty body, if empty
// try another url
if (html != null && html.contains("<div class=\"feature\">")) {
return FeatureInfoResponse.builder().html(response.getBody()).build();
if (html != null && (html.contains("class=\"feature\"") || html.contains("class=\"featureInfo\""))) {
return FeatureInfoResponse.builder().html(html).build();
}
} else if (MediaType.APPLICATION_XML.isCompatibleWith(response.getHeaders().getContentType())) {
FeatureInfoResponse r = xmlMapper.readValue(response.getBody(), FeatureInfoResponse.class);
Expand Down
Loading