From c3b54346bf55de9f5cd83ec1840b9af89dbda467 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Wed, 27 Oct 2021 18:39:43 +0100 Subject: Fix APEX policy creation issue Because of a not initialized javascript variable, the system calls a malformed url to create a APEX policy. This change correctly initializes the window.restRootURL when no apex_session is present in the localStorage. Issue-ID: POLICY-3794 Signed-off-by: andre.schmid Change-Id: I068bd86a747e7eafc3f17aa0faf5fdc778195711 --- .../src/main/resources/webapp/js/ApexMain.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gui-editors/gui-editor-apex/src/main') diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexMain.js b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexMain.js index d7019d3..ce491ec 100644 --- a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexMain.js +++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexMain.js @@ -111,21 +111,21 @@ $("#menu li").not(".emptyMessage").click(function() { }); function main_getRestRootURL() { - var href = location.protocol + const href = location.protocol + "//" + window.location.hostname + (location.port ? ':' + location.port : '') + (location.pathname.endsWith("/editor/") ? location.pathname.substring(0, location.pathname .indexOf("editor/")) : location.pathname); - var restContext = "apexservices/editor/"; + const restContext = "apexservices/editor/"; if (localStorage.getItem("apex_session")) { restRootURL = href + restContext + localStorage.getItem("apex_session"); - window.restRootURL = href + restContext + localStorage.getItem("apex_session"); - var requestURL = restRootURL + "/Model/GetKey"; + window.restRootURL = restRootURL; + const requestURL = restRootURL + "/Model/GetKey"; ajax_get(requestURL, function(data) { $("#statusMessageTable").append(" REST root URL set to: " + restRootURL + ""); if (localStorage.getItem("apex_model_loaded")) { - var modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey; + const modelKey = JSON.parse(data.messages.message[0]).apexArtifactKey; pageControl_modelMode(modelKey.name, modelKey.version, modelFileName); if (localStorage.getItem("apex_tab_index")) { $("#mainTabs").tabs({ @@ -135,11 +135,12 @@ function main_getRestRootURL() { } }); } else { - var createSessionURL = href + restContext + "-1/Session/Create"; + const createSessionURL = href + restContext + "-1/Session/Create"; ajax_get(createSessionURL, function(data) { localStorage.setItem("apex_session", data.messages.message[0]); restRootURL = href + restContext + localStorage.getItem("apex_session"); + window.restRootURL = restRootURL; $("#statusMessageTable").append(" REST root URL set to: " + restRootURL + ""); }); } -- cgit 1.2.3-korg