Fix OIDC Security event fired before runtime config ready in ARc

quarkusio · Dec 18, 2023 · 92d0dc5 · 92d0dc5
1 parent d190632
commit 92d0dc5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java
@@ -18,6 +18,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 import org.jose4j.jwk.JsonWebKey;
 import org.jose4j.jwk.PublicJsonWebKey;
@@ -46,7 +47,6 @@
 import io.quarkus.security.identity.AuthenticationRequestContext;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.identity.request.TokenAuthenticationRequest;
-import io.quarkus.security.runtime.SecurityConfig;
 import io.quarkus.security.spi.runtime.BlockingSecurityExecutor;
 import io.quarkus.security.spi.runtime.MethodDescription;
 import io.quarkus.security.spi.runtime.SecurityEventHelper;
@@ -559,7 +559,7 @@ private static boolean shouldFireOidcServerAvailableEvent(String tenantId) {
     }
 
     private static boolean fireOidcServerEvent(String authServerUrl, SecurityEvent.Type eventType) {
-        if (Arc.container().instance(SecurityConfig.class).get().events().enabled()) {
+        if (ConfigProvider.getConfig().getOptionalValue("quarkus.security.events.enabled", boolean.class).orElse(true)) {
             SecurityEventHelper.fire(
                     Arc.container().beanManager().getEvent().select(SecurityEvent.class),
                     new SecurityEvent(eventType, Map.of(AUTH_SERVER_URL, authServerUrl)));