Skip to content

AMP-30968:REST api does not report properly cors when sending a bad_request #4394

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

AMP-30968:REST api does not report properly cors when sending a bad_request #4394

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
7de68e8
AMP-30968:REST api does not report properly cors when sending a bad_r…
brianbrix May 9, 2025
1721ae1
AMP-30968:REST api does not report properly cors when sending a bad_r…
brianbrix May 9, 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
9 changes: 9 additions & 0 deletions ...rc/main/java/org/digijava/kernel/ampapi/endpoints/dashboards/services/PublicServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ public static Response buildOkResponseWithOriginHeaders(Object entity) {
.entity(entity)
.build();
}
public static Response buildBadRequestResponseWithOriginHeaders(Object entity) {
return Response
.status(Response.Status.BAD_REQUEST)
.header(ACCESS_CONTROL_ALLOW_ORIGIN, "*")
.header(ACCESS_CONTROL_ALLOW_HEADERS, "*")
.header(ACCESS_CONTROL_ALLOW_METHODS, "*")
.entity(entity)
.build();
}
}
6 changes: 3 additions & 3 deletions amp/src/main/java/org/digijava/kernel/ampapi/endpoints/publicportal/PublicEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ public Response describeTotalActivities() {
@ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK, message = "successful operation",
response = PublicTopData.class))
public final Response searchProjects(ReportFormParameters formParams) {
ApiErrorResponse result = ReportsUtil.validateReportConfig(formParams, true);
if (result != null) {
return Response.ok(result).build(); // FIXME return bad request
ApiErrorResponse errorResponse = ReportsUtil.validateReportConfig(formParams, true);
if (errorResponse != null) {
return PublicServices.buildBadRequestResponseWithOriginHeaders(errorResponse);
}
// we need reportId only to store the report result in cache
Long reportId = (long) formParams.getReportName().hashCode();
Expand Down
6 changes: 3 additions & 3 deletions amp/src/main/java/org/digijava/kernel/ampapi/endpoints/reports/Reports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ public final String getReportResult(
@ApiResponses(@ApiResponse(code = HttpServletResponse.SC_OK, message = "successful operation",
response = PagedReportResult.class))
public final Response getCustomReport(ReportFormParameters formParams) {
ApiErrorResponse result = ReportsUtil.validateReportConfig(formParams, true);
if (result != null) {
return Response.ok(result).build(); // FIXME return bad request
ApiErrorResponse errorResponse = ReportsUtil.validateReportConfig(formParams, true);
if (errorResponse != null) {
return PublicServices.buildBadRequestResponseWithOriginHeaders(errorResponse);
}
// we need reportId only to store the report result in cache
Long reportId = (long) formParams.getReportName().hashCode();
Expand Down