Add createTokenValidator method in OidcOpMetadataResolver in orde…

…r to reduce copy-pasted code (#2885) * Add `createTokenValidator()` method in `OidcOpMetadataResolver` in order to reduce copy-paste * remove unused import --------- Co-authored-by: dpodaruev <dpodaruev@naumen.ru>
pac4j · May 13, 2024 · be321de · be321de
1 parent 92b5ac9
commit be321de
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/AzureAdOpMetadataResolver.java b/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/AzureAdOpMetadataResolver.java
@@ -3,6 +3,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.pac4j.oidc.config.OidcConfiguration;
 import org.pac4j.oidc.profile.azuread.AzureAdTokenValidator;
+import org.pac4j.oidc.profile.creator.TokenValidator;
 
 /**
  * The metadata resolver for AzureAd.
@@ -22,13 +23,8 @@ public AzureAdOpMetadataResolver(final OidcConfiguration configuration) {
         super(configuration);
     }
 
-    /** {@inheritDoc} */
     @Override
-    protected void internalLoad() {
-        this.loaded = retrieveMetadata();
-
-        this.clientAuthentication = computeClientAuthentication();
-
-        this.tokenValidator = new AzureAdTokenValidator(configuration, this.loaded);
+    protected TokenValidator createTokenValidator() {
+        return new AzureAdTokenValidator(configuration, this.loaded);
     }
 }
diff --git a/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/OidcOpMetadataResolver.java b/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/OidcOpMetadataResolver.java
@@ -77,7 +77,7 @@ protected void internalLoad() {
 
         this.clientAuthentication = computeClientAuthentication();
 
-        this.tokenValidator = new TokenValidator(configuration, this.loaded);
+        this.tokenValidator = createTokenValidator();
     }
 
     /**
@@ -175,8 +175,8 @@ private static ClientAuthenticationMethod getPreferredAuthenticationMethod(OidcC
     }
 
     private static ClientAuthenticationMethod firstSupportedMethod(
-            final Collection<ClientAuthenticationMethod> serverSupportedAuthMethods,
-            Collection<ClientAuthenticationMethod> clientSupportedAuthMethods) {
+        final Collection<ClientAuthenticationMethod> serverSupportedAuthMethods,
+        Collection<ClientAuthenticationMethod> clientSupportedAuthMethods) {
         Collection<ClientAuthenticationMethod> supportedMethods =
             clientSupportedAuthMethods != null ? clientSupportedAuthMethods : SUPPORTED_METHODS;
         var firstSupported =
@@ -188,4 +188,13 @@ private static ClientAuthenticationMethod firstSupportedMethod(
                 + "supported: " + serverSupportedAuthMethods);
         }
     }
+
+    /**
+     * <p>createTokenValidator.</p>
+     *
+     * @return a {@link TokenValidator} object
+     */
+    protected TokenValidator createTokenValidator() {
+        return new TokenValidator(configuration, this.loaded);
+    }
 }
diff --git a/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/StaticOidcOpMetadataResolver.java b/pac4j-oidc/src/main/java/org/pac4j/oidc/metadata/StaticOidcOpMetadataResolver.java
@@ -2,7 +2,6 @@
 
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 import org.pac4j.oidc.config.OidcConfiguration;
-import org.pac4j.oidc.profile.creator.TokenValidator;
 
 /**
  * An OP metadata resolver with static metadata.
@@ -32,6 +31,6 @@ protected void internalLoad() {
 
         this.clientAuthentication = computeClientAuthentication();
 
-        this.tokenValidator = new TokenValidator(configuration, this.loaded);
+        this.tokenValidator = createTokenValidator();
     }
 }