feat: add external adito url parameter (#2063670)

Author: pas-n

modules/adito-data-service/src/main/java/org/flowable/aditoDataService/AditoDeploymentService.java

@@ -42,10 +42,10 @@ public ProcessDeployment deployProcess (String pProcessModelXML)
         return null;
     }
 
-    public String getProcessDefinitionUrl ()
+    public String getProcessDefinitionUrl()
     {
         if (disableDeployRedirect)
             return null;
-        return restClientService.getAditoBaseUrl().replace("host.docker.internal", "localhost") + aditoProcessDefinitionUrl;
+        return restClientService.getAditoExternalUrl().replace("host.docker.internal", "localhost") + aditoProcessDefinitionUrl;
     }
 }

modules/adito-data-service/src/main/java/org/flowable/aditoDataService/RestClientService.java

@@ -23,25 +23,29 @@ public class RestClientService
     private String aditoBaseUrl = "https://host.docker.internal:8443";
     private String aditoUser = "flowableIdmService";
     private String aditoPassword = "HczABCxBEUKSmwQEnT8vbmkE8Bj1hcXOKSbsLWBg";
+    private String aditoExternalUrl;
 
     private WebClient webClient;
     private final Logger logger = LoggerFactory.getLogger(RestClientService.class);
 
-    public WebClient getWebClient ()
+    public WebClient getWebClient()
     {
         return this.webClient;
     }
 
-    public String getAditoBaseUrl() {
+    public String getAditoExternalUrl() {
+        if (aditoExternalUrl != null)
+            return aditoExternalUrl;
         return aditoBaseUrl;
     }
 
-    public RestClientService (@Value("${aditoUrl:}") String springAditoBaseUrl, @Value("${aditoUser:}") String springAditoUser, @Value("${aditoPassword:}") String springAditoPassword)
+    public RestClientService(@Value("${aditoUrl:}") String springAditoBaseUrl, @Value("${aditoUser:}") String springAditoUser, @Value("${aditoPassword:}") String springAditoPassword,
+                             @Value("${aditoExternalUrl:}") String springAditoExternalUrl)
     {
         if (environmentVariablesArePresent())
             loadEndpointConfigFromEnvironment();
         else if (springVariablesArePresent(springAditoBaseUrl))
-            loadEndpointConfigFromSpring(springAditoBaseUrl, springAditoUser, springAditoPassword);
+            loadEndpointConfigFromSpring(springAditoBaseUrl, springAditoUser, springAditoPassword, springAditoExternalUrl);
         else
             logger.info("Using default core connection configuration");
 
@@ -87,9 +91,12 @@ private void loadEndpointConfigFromEnvironment()
         String password = System.getenv("ADITO_PASSWORD");
         if (password != null && !password.isEmpty())
             this.aditoPassword = password;
+        String aditoExternalUrl = System.getenv("ADITO_EXTERNAL_URL");
+        if (aditoExternalUrl != null && !aditoExternalUrl.isEmpty())
+            this.aditoExternalUrl = aditoExternalUrl;
     }
 
-    private void loadEndpointConfigFromSpring(String springAditoBaseUrl, String springAditoUser, String springAditoPassword)
+    private void loadEndpointConfigFromSpring(String springAditoBaseUrl, String springAditoUser, String springAditoPassword, String springAditoExternalUrl)
     {
         logger.info("Loading core connection configuration from spring application json");
         if (springAditoBaseUrl != null && !springAditoBaseUrl.isEmpty())
@@ -98,6 +105,8 @@ private void loadEndpointConfigFromSpring(String springAditoBaseUrl, String spri
             this.aditoUser = springAditoUser;
         if (springAditoPassword != null && !springAditoPassword.isEmpty())
             this.aditoPassword = springAditoPassword;
+        if (springAditoPassword != null && !springAditoPassword.isEmpty())
+            this.aditoExternalUrl = springAditoExternalUrl;
     }
 
     public String get(String url, MultiValueMap<String, String> queryParams, Map<String,String> headers)
@@ -118,5 +127,4 @@ protected String get(String url)
     {
         return get(url, null, null);
     }
-
 }

modules/flowable-ui-modeler/flowable-ui-modeler-rest/src/main/java/org/flowable/ui/modeler/rest/app/DeploymentResource.java

@@ -29,7 +29,7 @@ public ProcessDeployment deployProcess(@PathVariable String modelId)
     }
 
     @GetMapping(value = "/rest/adito-process-definition-url", produces = "text/plain")
-    public String getAditoProcessDefinitionUrl ()
+    public String getAditoProcessDefinitionUrl()
     {
         return aditoDeploymentService.getProcessDefinitionUrl();
     }