RESTful service: List Web Applications - Suppress Keycloak Client ID …

…for local Web Services #2101
dcm4che · Jul 30, 2019 · 118dff3 · 118dff3
1 parent a146497
commit 118dff3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/dcm4chee-arc-conf-rs/src/main/java/org/dcm4chee/arc/conf/rs/ConfigurationRS.java b/dcm4chee-arc-conf-rs/src/main/java/org/dcm4chee/arc/conf/rs/ConfigurationRS.java
@@ -195,7 +195,7 @@ public Response listWebApps() {
                     JsonGenerator gen = Json.createGenerator(out);
                     gen.writeStartArray();
                     for (WebApplicationInfo webappInfo : webappInfos)
-                        jsonConf.writeTo(webappInfo, gen);
+                        jsonConf.writeTo(webappInfo, gen, keycloakClientID(webappInfo));
                     gen.writeEnd();
                     gen.flush();
                 }).build();
@@ -204,6 +204,15 @@ public Response listWebApps() {
         }
     }
 
+    private String keycloakClientID(WebApplicationInfo webAppInfo) {
+        String authURL = System.getProperty("auth-server-url");
+        KeycloakClient keycloakClient = webAppInfo.getKeycloakClient();
+        return keycloakClient == null || authURL == null
+                || (authURL.equals(keycloakClient.getKeycloakServerURL())
+                    && System.getProperty("realm-name", "dcm4che").equals(keycloakClient.getKeycloakRealm()))
+                ? null : webAppInfo.getKeycloakClientID();
+    }
+
     @GET
     @NoCache
     @Path("/hl7apps")
@@ -633,6 +642,9 @@ private static WebApplicationInfo toWebApplicationInfo(UriInfo info) {
                 case "dicomApplicationCluster":
                     webappInfo.setApplicationClusters(toArray(value));
                     break;
+                case "dcmKeycloakClientID":
+                    webappInfo.setKeycloakClientID(firstValueOf(value));
+                    break;
             }
         });
         return webappInfo;

diff --git a/dcm4chee-arc-ui2/src/swagger/openapi.json b/dcm4chee-arc-ui2/src/swagger/openapi.json
@@ -3166,6 +3166,9 @@
           {
             "$ref": "#/components/parameters/dicomAETitle"
           },
+          {
+            "$ref": "#/components/parameters/dcmKeycloakClientID"
+          },
           {
             "$ref": "#/components/parameters/dicomApplicationCluster"
           }
@@ -13448,6 +13451,14 @@
           "type": "string"
         }
       },
+      "dcmKeycloakClientID": {
+        "name": "dcmKeycloakClientID",
+        "in": "query",
+        "description": "Keycloak Client ID",
+        "schema": {
+          "type": "string"
+        }
+      },
       "dicomManufacturer": {
         "name": "dicomManufacturer",
         "in": "query",