Skip to content

fix 403 error in AIMS wfs download #198

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
utas-raymondng merged 1 commit into from
Nov 13, 2025
Merged

fix 403 error in AIMS wfs download #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions server/src/main/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import au.org.aodn.ogcapi.server.core.util.DatetimeUtils;
import au.org.aodn.ogcapi.server.core.util.GeometryUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
Expand All @@ -25,17 +27,20 @@ public class DownloadWfsDataService {
private final WfsServer wfsServer;
private final RestTemplate restTemplate;
private final WfsDefaultParam wfsDefaultParam;
private final HttpEntity<?> pretendUserEntity;

public DownloadWfsDataService(
WmsServer wmsServer,
WfsServer wfsServer,
RestTemplate restTemplate,
WfsDefaultParam wfsDefaultParam
WfsDefaultParam wfsDefaultParam,
@Qualifier("pretendUserEntity") HttpEntity<?> pretendUserEntity
) {
this.wmsServer = wmsServer;
this.wfsServer = wfsServer;
this.restTemplate = restTemplate;
this.wfsDefaultParam = wfsDefaultParam;
this.pretendUserEntity = pretendUserEntity;
}

/**
Expand Down Expand Up @@ -174,7 +179,10 @@ public void executeWfsRequestWithSse(
restTemplate.execute(
wfsRequestUrl,
HttpMethod.GET,
null,
request -> {
// Set headers from pretendUserEntity
request.getHeaders().addAll(pretendUserEntity.getHeaders());
},
clientHttpResponse -> {
// WFS server has responded!
wfsServerResponded.set(true);
Expand Down
6 changes: 5 additions & 1 deletion .../src/test/java/au/org/aodn/ogcapi/server/core/service/wfs/DownloadWfsDataServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.HttpEntity;
import org.springframework.web.client.RestTemplate;

import java.util.ArrayList;
Expand Down Expand Up @@ -38,12 +39,15 @@ public class DownloadWfsDataServiceTest {
@Mock
private WfsDefaultParam wfsDefaultParam;

@Mock
private HttpEntity<?> pretendUserEntity;

private DownloadWfsDataService downloadWfsDataService;

@BeforeEach
public void setUp() {
downloadWfsDataService = new DownloadWfsDataService(
wmsServer, wfsServer, restTemplate, wfsDefaultParam
wmsServer, wfsServer, restTemplate, wfsDefaultParam, pretendUserEntity
);
}

Expand Down