Revert "dcm4che/dcm4chee-arc-light#2101 : RESTful service: List Web A…

…pplications - Suppress Keycloak Client ID for local Web Services" This reverts commit 834070f.
patrick-peer · Oct 17, 2019 · 38654c3 · 38654c3
1 parent 8e1cb7d
commit 38654c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...e-conf/dcm4che-conf-ldap/src/main/java/org/dcm4che3/conf/ldap/LdapDicomConfiguration.java b/...e-conf/dcm4che-conf-ldap/src/main/java/org/dcm4che3/conf/ldap/LdapDicomConfiguration.java
@@ -520,6 +520,7 @@ private void loadFrom(WebApplicationInfo webappInfo, Attributes attrs, String de
         webappInfo.setAETitle(LdapUtils.stringValue(attrs.get("dicomAETitle"), null));
         webappInfo.setApplicationClusters(LdapUtils.stringArray(attrs.get("dicomApplicationCluster")));
         String keycloakClientID = LdapUtils.stringValue(attrs.get("dcmKeycloakClientID"), null);
+        webappInfo.setKeycloakClientID(keycloakClientID);
         webappInfo.setInstalled(LdapUtils.booleanValue(attrs.get("dicomInstalled"), null));
         for (String connDN : LdapUtils.stringArray(attrs.get("dicomNetworkConnectionReference")))
             webappInfo.getConnections().add(findConnection(connDN, connCache));

diff --git a/dcm4che-net/src/main/java/org/dcm4che3/net/WebApplicationInfo.java b/dcm4che-net/src/main/java/org/dcm4che3/net/WebApplicationInfo.java
@@ -58,6 +58,7 @@ public class WebApplicationInfo {
     private String servicePath;
     private String aeTitle;
     private String[] applicationClusters = {};
+    private String keycloakClientID;
     private KeycloakClient keycloakClient;
     private Boolean installed;
     private EnumSet<WebApplication.ServiceClass> serviceClasses = EnumSet.noneOf(WebApplication.ServiceClass.class);
@@ -112,13 +113,11 @@ public void setApplicationClusters(String[] applicationClusters) {
     }
 
     public String getKeycloakClientID() {
-        String authURL = System.getProperty("auth-server-url");
-        if (keycloakClient == null || authURL == null
-                || (authURL.equals(keycloakClient.getKeycloakServerURL())
-                    && System.getProperty("realm-name", "dcm4che").equals(keycloakClient.getKeycloakRealm())))
-            return null;
+        return keycloakClientID;
+    }
 
-        return keycloakClient.getKeycloakClientID();
+    public void setKeycloakClientID(String keycloakClientID) {
+        this.keycloakClientID = keycloakClientID;
     }
 
     public KeycloakClient getKeycloakClient() {