Skip to content
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

chore: add Redirect from old icon endpoint [DHIS2-16042] #15802

Merged
merged 5 commits into from
Dec 5, 2023
Merged

chore: add Redirect from old icon endpoint [DHIS2-16042] #15802

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c82d370
redirect from old icon endpoint
zubaira Nov 30, 2023
9649386
iconkey
zubaira Nov 30, 2023
66c2848
Merge branch 'master' into DHIS2-16042
zubaira Dec 4, 2023
5bfa191
correct URL
zubaira Dec 4, 2023
1812979
add deprecated
zubaira Dec 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
10 changes: 7 additions & 3 deletions dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/icon/IconController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -56,6 +57,7 @@
import org.hisp.dhis.icon.IconService;
import org.hisp.dhis.schema.descriptors.IconSchemaDescriptor;
import org.hisp.dhis.webapi.mvc.annotation.ApiVersion;
import org.hisp.dhis.webapi.utils.ContextUtils;
import org.hisp.dhis.webapi.utils.HeaderUtils;
import org.springframework.core.io.Resource;
import org.springframework.http.CacheControl;
Expand Down Expand Up @@ -100,9 +102,11 @@
}

@GetMapping("/{iconKey}/icon.svg")
public void getIconData(HttpServletResponse response, @PathVariable String iconKey)
throws IOException, NotFoundException {
downloadDefaultIcon(iconKey, response);
public void getIconData(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we also mark the endpoint as deprecated? or is it not necessary?

HttpServletResponse response, HttpServletRequest request, @PathVariable String iconKey)
throws IOException {
String location = response.encodeRedirectURL("/icons/" + iconKey + "/icon");
response.sendRedirect(ContextUtils.getRootPath(request) + location);

Check warning

Code scanning / CodeQL

URL redirection from remote source Medium

Untrusted URL redirection depends on a
user-provided value
Loading
.
}

@GetMapping(value = "/{key}/icon")
Expand Down
Loading