From f8b8ef7bccf490dd0cb96aed257f125671fd0ab3 Mon Sep 17 00:00:00 2001 From: Steven Hawkins Date: Wed, 6 Aug 2025 02:50:43 -0400 Subject: [PATCH] fix: correcting how provider default is found (#41678) closes: #41677 Signed-off-by: Steve Hawkins (cherry picked from commit 5731cdf6738bc4344d495bd1193fe531f4f7ed7a) --- .../runtime/configuration/Configuration.java | 8 ++++---- .../configuration/MicroProfileConfigProvider.java | 2 +- .../runtime/configuration/ConfigurationTest.java | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java index 46f0192e267f..9a9c14da7243 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java @@ -180,10 +180,10 @@ public static String toDashCase(String key) { for (int i = 0; i < key.length(); i++) { char c = key.charAt(i); - if (c == ',') { - c = '-'; // should not happen, but was allowed by the previous logic - } - if (l && Character.isUpperCase(c)) { + if (c == '.') { + c = '-'; // this is not documented, but was in the previous logic + l = false; + } else if (l && Character.isUpperCase(c)) { sb.append('-'); c = Character.toLowerCase(c); l = false; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java index 8e516dda3120..7aee9bccc315 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java @@ -52,7 +52,7 @@ public String getProvider(String spi) { @Override public String getDefaultProvider(String spi) { - return scope(spi).get("provider.default"); + return scope(spi).get("provider-default"); } @Override diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java index 69367b86c767..3714023fe02b 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java @@ -187,6 +187,20 @@ public void testResolveTransformedValue() { assertEquals("true", createConfig().getConfigValue("kc.proxy-allow-forwarded-header").getValue()); } + @Test + public void testProviderDefault() { + ConfigArgsConfigSource.setCliArgs("--spi-client-registration--provider-default=openid-connect"); + initConfig("client-registration"); + assertEquals("openid-connect", Config.getDefaultProvider("client-registration")); + } + + @Test + public void testScopePropertyWithPeriod() { + ConfigArgsConfigSource.setCliArgs("--spi-client-registration--openid-connect--some-property=value"); + Config.Scope scope = initConfig("client-registration", "openid-connect"); + assertEquals("value", scope.get("some.property")); + } + @Test public void testPropertyNamesFromConfig() { ConfigArgsConfigSource.setCliArgs("--spi-client-registration-openid-connect-static-jwk-url=http://c.jwk.url");