Merge pull request quarkusio#44906 from sberyozkin/oidc_config_mappin…

…g_updates Update OidcTenantConfigBuilder shortcuts
ppalaga · Dec 18, 2024 · 7984bf3 · 7984bf3
2 parents 9943ebd + eecda81
commit 7984bf3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfigBuilder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfigBuilder.java
@@ -466,20 +466,11 @@ public OidcTenantConfigBuilder token(Token token) {
     }
 
     /**
-     * @param verifyAccessTokenWithUserInfo {@link Token#verifyAccessTokenWithUserInfo()}
      * @param principalClaim {@link Token#principalClaim()}
      * @return this builder
      */
-    public OidcTenantConfigBuilder token(boolean verifyAccessTokenWithUserInfo, String principalClaim) {
-        return token().verifyAccessTokenWithUserInfo(verifyAccessTokenWithUserInfo).principalClaim(principalClaim).end();
-    }
-
-    /**
-     * @param verifyAccessTokenWithUserInfo {@link Token#verifyAccessTokenWithUserInfo()}
-     * @return this builder
-     */
-    public OidcTenantConfigBuilder token(boolean verifyAccessTokenWithUserInfo) {
-        return token().verifyAccessTokenWithUserInfo(verifyAccessTokenWithUserInfo).end();
+    public OidcTenantConfigBuilder token(String principalClaim) {
+        return token().principalClaim(principalClaim).end();
     }
 
     /**

diff --git a/...ions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java b/...ions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java
@@ -34,7 +34,7 @@ private static OidcTenantConfig slack() {
         return OidcTenantConfig
                 .authServerUrl("https://slack.com")
                 .applicationType(WEB_APP)
-                .token().principalClaim("name").end()
+                .token("name")
                 .authentication()
                 .forceRedirectHttpsScheme()
                 .scopes("profile", "email")
@@ -64,7 +64,7 @@ private static OidcTenantConfig github() {
                 .authorizationPath("authorize")
                 .tokenPath("access_token")
                 .userInfoPath("https://api.github.com/user")
-                .token(true, "name")
+                .token().verifyAccessTokenWithUserInfo(true).principalClaim("name").end()
                 .authentication(authBuilder.build())
                 .build();
     }
@@ -93,7 +93,7 @@ private static OidcTenantConfig google() {
                 .authServerUrl("https://accounts.google.com")
                 .applicationType(WEB_APP)
                 .authentication().scopes("openid", "email", "profile").end()
-                .token(true, "name")
+                .token().verifyAccessTokenWithUserInfo(true).principalClaim("name").end()
                 .build();
     }
 
@@ -171,7 +171,7 @@ private static OidcTenantConfig spotify() {
                 .authorizationPath("authorize")
                 .tokenPath("api/token")
                 .userInfoPath("https://api.spotify.com/v1/me")
-                .token(true, "display_name")
+                .token().verifyAccessTokenWithUserInfo(true).principalClaim("display_name").end()
                 .authentication(authentication)
                 .build();
     }
@@ -183,7 +183,7 @@ private static OidcTenantConfig strava() {
                 .discoveryEnabled(false)
                 .authorizationPath("authorize")
                 .tokenPath("token")
-                .token(true)
+                .token().verifyAccessTokenWithUserInfo(true).end()
                 .userInfoPath("https://www.strava.com/api/v3/athlete");
 
         builder.authentication()
@@ -218,7 +218,7 @@ private static OidcTenantConfig discord() {
                 .authorizationPath("authorize")
                 .tokenPath("token")
                 .jwksPath("keys")
-                .token(true)
+                .token().verifyAccessTokenWithUserInfo(true).end()
                 .authentication().scopes("identify", "email").idTokenRequired(false).end()
                 .userInfoPath("https://discord.com/api/users/@me")
                 .build();

diff --git a/...sions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcTenantConfigBuilderTest.java b/...sions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/OidcTenantConfigBuilderTest.java
@@ -1089,7 +1089,7 @@ public void testTokenBuilder() {
                 .requiredClaims(Map.of("III", "IV"))
                 .audience("extra");
         var config2 = second.end()
-                .token(false, "prince")
+                .token().verifyAccessTokenWithUserInfo(false).principalClaim("prince").end()
                 .build();
         var builtSecond = config2.token();
         assertFalse(builtSecond.verifyAccessTokenWithUserInfo().orElseThrow());
@@ -1107,7 +1107,7 @@ public void testTokenBuilder() {
         assertTrue(builtSecond.audience().orElseThrow().contains("extra"));
         assertEquals("prince", builtSecond.principalClaim().orElse(null));
 
-        var config3 = OidcTenantConfig.builder(config2).token(true).build();
+        var config3 = OidcTenantConfig.builder(config2).token().verifyAccessTokenWithUserInfo().end().build();
         assertTrue(config3.token().verifyAccessTokenWithUserInfo().orElseThrow());
 
         assertEquals("haha", config3.tenantId().orElse(null));