Merge branch 'IM-502-Error-in-K.Explorer-while-trying-to-perform-logg…

…ing-in-integration-environment' into IM-457-Merge-develop-in-IM-384
integratedmodelling · Dec 12, 2024 · ac7c89b · ac7c89b
2 parents fe76935 + 9446faf
commit ac7c89b
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 85 deletions.
diff --git a/...tegratedmodelling.klab.api/src/org/integratedmodelling/klab/api/auth/KlabHttpHeaders.java b/...tegratedmodelling.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/...a/org/integratedmodelling/klab/engine/rest/controllers/engine/EnginePublicController.java b/...a/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);

diff --git a/...urces/static/ui/css/6619c582.b0f9de2f.css → ...urces/static/ui/css/4365aeeb.b0f9de2f.css b/...urces/static/ui/css/6619c582.b0f9de2f.css → ...urces/static/ui/css/4365aeeb.b0f9de2f.css
diff --git a/klab.engine/src/main/resources/static/ui/index.html b/klab.engine/src/main/resources/static/ui/index.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=description content="Web based explorer for k.LAB engine"><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><title>k.Explorer</title><link rel=icon href=statics/klab-logo.png type=image/x-icon><link rel=icon type=image/png sizes=32x32 href=statics/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=statics/icons/favicon-16x16.png><link rel=stylesheet type=text/css href=/modeler/shared/report.css><link rel=stylesheet type=text/css href=/modeler/shared/documentation.css><script type=text/javascript src=statics/js/xlsx.full.min.js></script><script>var environmentPath = "/modeler/engine/environments";
-    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><link as=style href=css/app.27820942.css rel=preload><link as=script href=js/app.5acec31b.js rel=preload><link as=script href=js/runtime.60ad2521.js rel=preload><link as=script href=js/vendor.bfa7f89f.js rel=preload><link href=css/6619c582.b0f9de2f.css rel=prefetch><link href=js/4b4818b8.cd768103.js rel=prefetch><link href=js/6619c582.b94b64e5.js rel=prefetch><link href=css/app.27820942.css rel=stylesheet></head><body><noscript><style>[data-simplebar] {
+    document.write("<script src='" + environmentPath + "' type='text/javascript'><\/script>");</script><link as=style href=css/app.27820942.css rel=preload><link as=script href=js/app.87cc1f0f.js rel=preload><link as=script href=js/runtime.5d4b968f.js rel=preload><link as=script href=js/vendor.c26ff961.js rel=preload><link href=css/4365aeeb.b0f9de2f.css rel=prefetch><link href=js/4365aeeb.a8ccfbdc.js rel=prefetch><link href=js/4b4818b8.cd768103.js rel=prefetch><link href=css/app.27820942.css rel=stylesheet></head><body><noscript><style>[data-simplebar] {
           overflow: auto;
-        }</style></noscript><div id=q-app></div><script type=text/javascript src=js/app.5acec31b.js></script><script type=text/javascript src=js/runtime.60ad2521.js></script><script type=text/javascript src=js/vendor.bfa7f89f.js></script></body></html>
+        }</style></noscript><div id=q-app></div><script type=text/javascript src=js/app.87cc1f0f.js></script><script type=text/javascript src=js/runtime.5d4b968f.js></script><script type=text/javascript src=js/vendor.c26ff961.js></script></body></html>