From 5a7bef36148a6ebf4adf94a4885d74fd0ffc15a8 Mon Sep 17 00:00:00 2001 From: Kristina Date: Wed, 11 Dec 2024 11:16:55 +0100 Subject: [PATCH] IM-502 refactor: replace Klab_Authorization with klab-authorization Fix error caused by Nginx not allowing underscores (_) in headers. --- .../klab/api/auth/KlabHttpHeaders.java | 2 +- .../controllers/engine/EnginePublicController.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/klab/api/auth/KlabHttpHeaders.java b/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/klab/api/auth/KlabHttpHeaders.java index 887c5e376..7dd2f4fff 100644 --- a/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/klab/api/auth/KlabHttpHeaders.java +++ b/api/org.integratedmodelling.klab.api/src/org/integratedmodelling/klab/api/auth/KlabHttpHeaders.java @@ -15,6 +15,6 @@ public interface KlabHttpHeaders { /** * Designed to send session information with requests. **/ - public static final String KLAB_AUTHORIZATION = "Klab_Authorization"; + public static final String KLAB_AUTHORIZATION = "klab-authorization"; } diff --git a/klab.engine/src/main/java/org/integratedmodelling/klab/engine/rest/controllers/engine/EnginePublicController.java b/klab.engine/src/main/java/org/integratedmodelling/klab/engine/rest/controllers/engine/EnginePublicController.java index 8a0778231..9f92f7c6f 100644 --- a/klab.engine/src/main/java/org/integratedmodelling/klab/engine/rest/controllers/engine/EnginePublicController.java +++ b/klab.engine/src/main/java/org/integratedmodelling/klab/engine/rest/controllers/engine/EnginePublicController.java @@ -21,6 +21,7 @@ import org.integratedmodelling.klab.api.API; import org.integratedmodelling.klab.api.PublicAPI; import org.integratedmodelling.klab.api.auth.IUserIdentity; +import org.integratedmodelling.klab.api.auth.KlabHttpHeaders; import org.integratedmodelling.klab.api.auth.Roles; import org.integratedmodelling.klab.api.data.ILocator; import org.integratedmodelling.klab.api.data.adapters.IResourceAdapter; @@ -80,7 +81,7 @@ public class EnginePublicController implements API.PUBLIC { @RequestMapping(value = CREATE_CONTEXT, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody public TicketResponse.Ticket contextRequest(@RequestBody ContextRequest request, - @RequestHeader(name = "Klab_Authorization") String session) { + @RequestHeader(name = KlabHttpHeaders.KLAB_AUTHORIZATION) String session) { Session s = Authentication.INSTANCE.getIdentity(session, Session.class); if (s == null) { @@ -110,7 +111,7 @@ public TicketResponse.Ticket contextRequest(@RequestBody ContextRequest request, @RequestMapping(value = OBSERVE_IN_CONTEXT, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody public TicketResponse.Ticket observationRequest(@RequestBody ObservationRequest request, - @RequestHeader(name = "Klab_Authorization") String session, @PathVariable String context) { + @RequestHeader(name = KlabHttpHeaders.KLAB_AUTHORIZATION) String session, @PathVariable String context) { Session s = Authentication.INSTANCE.getIdentity(session, Session.class); @@ -144,7 +145,7 @@ public TicketResponse.Ticket observationRequest(@RequestBody ObservationRequest @RequestMapping(value = SUBMIT_ESTIMATE, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - public TicketResponse.Ticket submitEstimate(@RequestHeader(name = "Klab_Authorization") String session, + public TicketResponse.Ticket submitEstimate(@RequestHeader(name = KlabHttpHeaders.KLAB_AUTHORIZATION) String session, @PathVariable String estimate) { Session s = Authentication.INSTANCE.getIdentity(session, Session.class); @@ -175,7 +176,7 @@ public TicketResponse.Ticket submitEstimate(@RequestHeader(name = "Klab_Authoriz MediaType.TEXT_PLAIN_VALUE, MediaType.APPLICATION_PDF_VALUE, MediaType.IMAGE_PNG_VALUE, "text/csv", "image/tiff", "application/vnd.ms-excel", "application/octet-stream", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"}) - public void exportData(@PathVariable String export, @RequestHeader(name = "Klab_Authorization") String session, + public void exportData(@PathVariable String export, @RequestHeader(name = KlabHttpHeaders.KLAB_AUTHORIZATION) String session, @PathVariable String observation, @RequestHeader(name = "Accept") String format, @RequestParam(required = false) String view, @RequestParam(required = false) String viewport, @RequestParam(required = false) String locator, HttpServletResponse response) throws IOException { @@ -387,7 +388,7 @@ private void outputImage(IObservation obs, HttpServletResponse response, Export @RequestMapping(value = TICKET_INFO, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @ResponseBody - public TicketResponse.Ticket getTicketInfo(@RequestHeader(name = "Klab_Authorization") String session, + public TicketResponse.Ticket getTicketInfo(@RequestHeader(name = KlabHttpHeaders.KLAB_AUTHORIZATION) String session, @PathVariable String ticket) { Session s = Authentication.INSTANCE.getIdentity(session, Session.class);