Merge pull request #34649 from michalvavrik/feature/fix-oidc-dev-ui-r…

…eload Fix OIDC DEV UI Live Reload
quarkusio · Jul 10, 2023 · b71789b · b71789b
2 parents 2649e7c + 1a64161
commit b71789b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/...ent/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevConsoleProcessor.java b/...ent/src/main/java/io/quarkus/oidc/deployment/devservices/AbstractDevConsoleProcessor.java
@@ -1,6 +1,7 @@
 package io.quarkus.oidc.deployment.devservices;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 
 import jakarta.inject.Singleton;
@@ -109,7 +110,7 @@ protected static CardPageBuildItem createProviderWebComponent(OidcDevUiRecorder
             ConfigurationBuildItem configurationBuildItem,
             String keycloakAdminUrl,
             Map<String, String> keycloakUsers,
-            Object keycloakRealms,
+            List<String> keycloakRealms,
             boolean alwaysLogoutUserInDevUiOnReload) {
         final CardPageBuildItem cardPage = new CardPageBuildItem();
 

diff --git a/...ain/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java b/...ain/java/io/quarkus/oidc/deployment/devservices/keycloak/KeycloakDevConsoleProcessor.java
@@ -1,5 +1,6 @@
 package io.quarkus.oidc.deployment.devservices.keycloak;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -84,6 +85,9 @@ void produceProviderComponent(Optional<KeycloakDevServicesConfigBuildItem> confi
 
             String keycloakAdminUrl = configProps.get().getConfig().get("keycloak.url");
 
+            @SuppressWarnings("unchecked")
+            final List<String> keycloakRealms = (List<String>) configProps.get().getProperties().get("keycloak.realms");
+
             CardPageBuildItem cardPageBuildItem = createProviderWebComponent(
                     recorder,
                     capabilities,
@@ -102,7 +106,7 @@ void produceProviderComponent(Optional<KeycloakDevServicesConfigBuildItem> confi
                     configurationBuildItem,
                     keycloakAdminUrl,
                     users,
-                    configProps.get().getProperties().get("keycloak.realms"),
+                    keycloakRealms,
                     configProps.get().isContainerRestarted());
 
             // Also add Admin page

diff --git a/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java b/...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevJsonRpcService.java
@@ -3,6 +3,7 @@
 import static io.quarkus.oidc.runtime.devui.OidcDevServicesUtils.getTokens;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 
 import io.quarkus.arc.Arc;
@@ -30,7 +31,7 @@ public class OidcDevJsonRpcService {
     private final String oidcGrantType;
     private final boolean introspectionIsAvailable;
     private final String keycloakAdminUrl;
-    private final Object keycloakRealms;
+    private final List<String> keycloakRealms;
     private final boolean swaggerIsAvailable;
     private final boolean graphqlIsAvailable;
     private final String swaggerUiPath;

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRecorder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRecorder.java
@@ -1,6 +1,7 @@
 package io.quarkus.oidc.runtime.devui;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -11,7 +12,7 @@ public class OidcDevUiRecorder {
     public Supplier<OidcDevUiRpcSvcPropertiesBean> prepareRpcServiceProperties(String authorizationUrl, String tokenUrl,
             String logoutUrl, Duration webClientTimeout, Map<String, Map<String, String>> grantOptions,
             Map<String, String> oidcUsers, String oidcProviderName, String oidcApplicationType, String oidcGrantType,
-            boolean introspectionIsAvailable, String keycloakAdminUrl, Object keycloakRealms, boolean swaggerIsAvailable,
+            boolean introspectionIsAvailable, String keycloakAdminUrl, List<String> keycloakRealms, boolean swaggerIsAvailable,
             boolean graphqlIsAvailable, String swaggerUiPath, String graphqlUiPath, boolean alwaysLogoutUserInDevUiOnReload) {
         return new Supplier<OidcDevUiRpcSvcPropertiesBean>() {
             @Override

diff --git a/...dc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRpcSvcPropertiesBean.java b/...dc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRpcSvcPropertiesBean.java
@@ -1,6 +1,7 @@
 package io.quarkus.oidc.runtime.devui;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -17,7 +18,7 @@ public class OidcDevUiRpcSvcPropertiesBean {
     private final String oidcGrantType;
     private final boolean introspectionIsAvailable;
     private final String keycloakAdminUrl;
-    private final Object keycloakRealms;
+    private final List<String> keycloakRealms;
     private final boolean swaggerIsAvailable;
     private final boolean graphqlIsAvailable;
     private final String swaggerUiPath;
@@ -33,7 +34,7 @@ public class OidcDevUiRpcSvcPropertiesBean {
             Duration webClientTimeout, Map<String, Map<String, String>> grantOptions,
             Map<String, String> oidcUsers, String oidcProviderName, String oidcApplicationType,
             String oidcGrantType, boolean introspectionIsAvailable, String keycloakAdminUrl,
-            Object keycloakRealms, boolean swaggerIsAvailable, boolean graphqlIsAvailable,
+            List<String> keycloakRealms, boolean swaggerIsAvailable, boolean graphqlIsAvailable,
             String swaggerUiPath, String graphqlUiPath, boolean alwaysLogoutUserInDevUiOnReload) {
         this.authorizationUrl = authorizationUrl;
         this.tokenUrl = tokenUrl;
@@ -95,7 +96,7 @@ String getKeycloakAdminUrl() {
         return keycloakAdminUrl;
     }
 
-    Object getKeycloakRealms() {
+    List<String> getKeycloakRealms() {
         return keycloakRealms;
     }
 

diff --git a/...dc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRuntimePropertiesDTO.java b/...dc/runtime/src/main/java/io/quarkus/oidc/runtime/devui/OidcDevUiRuntimePropertiesDTO.java
@@ -1,5 +1,7 @@
 package io.quarkus.oidc.runtime.devui;
 
+import java.util.List;
+
 import org.eclipse.microprofile.config.Config;
 
 import io.quarkus.oidc.runtime.OidcConfigPropertySupplier;
@@ -26,7 +28,7 @@ public class OidcDevUiRuntimePropertiesDTO {
     private final String oidcGrantType;
     private final boolean introspectionIsAvailable;
     private final String keycloakAdminUrl;
-    private final Object keycloakRealms;
+    private final List<String> keycloakRealms;
     private final boolean swaggerIsAvailable;
     private final boolean graphqlIsAvailable;
     private final String swaggerUiPath;
@@ -36,7 +38,7 @@ public class OidcDevUiRuntimePropertiesDTO {
 
     OidcDevUiRuntimePropertiesDTO(String authorizationUrl, String tokenUrl, String logoutUrl, Config config, int httpPort,
             String oidcProviderName, String oidcApplicationType, String oidcGrantType,
-            boolean introspectionIsAvailable, String keycloakAdminUrl, Object keycloakRealms,
+            boolean introspectionIsAvailable, String keycloakAdminUrl, List<String> keycloakRealms,
             boolean swaggerIsAvailable, boolean graphqlIsAvailable, String swaggerUiPath,
             String graphqlUiPath, boolean alwaysLogoutUserInDevUiOnReload, String propertiesStateId) {
         this.clientId = new OidcConfigPropertySupplier(CLIENT_ID_CONFIG_KEY).get(config);
@@ -114,7 +116,7 @@ public String getKeycloakAdminUrl() {
         return keycloakAdminUrl;
     }
 
-    public Object getKeycloakRealms() {
+    public List<String> getKeycloakRealms() {
         return keycloakRealms;
     }