[java-oidc-common] branch main updated: JCOMOIDC-101 - Fix Principal typing issue in profile config default implementation

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch main
in repository java-oidc-common.

View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=df6e954a8a3f3e618fdb843358f3a84d440dbee2

The following commit(s) were added to refs/heads/main by this push:
     new df6e954  JCOMOIDC-101 - Fix Principal typing issue in profile config default implementation
df6e954 is described below

commit df6e954a8a3f3e618fdb843358f3a84d440dbee2
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Feb 23 09:36:49 2024 +0000

    JCOMOIDC-101 - Fix Principal typing issue in profile config default
    implementation
    
    https://shibboleth.atlassian.net/browse/JCOMOIDC-101
---
 ...stractOAuth2ClientAuthenticableProfileConfiguration.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/AbstractOAuth2ClientAuthenticableProfileConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
index a24d5a6..79a0e9c 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/AbstractOAuth2ClientAuthenticableProfileConfiguration.java
@@ -30,7 +30,6 @@ import org.opensaml.profile.context.ProfileRequestContext;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthenticationMethod;
 
 import net.shibboleth.idp.profile.config.AbstractInterceptorAwareProfileConfiguration;
-import net.shibboleth.oidc.authn.principal.AuthenticationContextClassReferencePrincipal;
 import net.shibboleth.oidc.jwt.claims.ClaimsValidator;
 import net.shibboleth.oidc.metadata.policy.UnregisteredClientPolicy;
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2ClientAuthenticableClientProfileConfiguration;
@@ -70,8 +69,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
     @Nonnull private Function<ProfileRequestContext,Integer> proxyCountLookupStrategy;
 
     /** Lookup function to supply default authentication methods. */
-    @Nonnull private Function<ProfileRequestContext,Collection<AuthenticationContextClassReferencePrincipal>>
-            defaultAuthenticationContextsLookupStrategy;
+    @Nonnull private Function<ProfileRequestContext,Collection<Principal>> defaultAuthenticationContextsLookupStrategy;
 
     /** Lookup function to supply authentication flows. */
     @Nonnull private Function<ProfileRequestContext,Set<String>> authenticationFlowsLookupStrategy;
@@ -352,7 +350,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
     @Override
     @Nonnull @NonnullElements @NotLive @Unmodifiable public List<Principal> getDefaultAuthenticationMethods(
             @Nullable final ProfileRequestContext profileRequestContext) {
-        final Collection<AuthenticationContextClassReferencePrincipal> methods =
+        final Collection<Principal> methods =
                 defaultAuthenticationContextsLookupStrategy.apply(profileRequestContext);
         if (methods != null) {
             return CollectionSupport.copyToList(methods);
@@ -366,9 +364,10 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
      * @param contexts default authentication contexts to use
      */
     public void setDefaultAuthenticationMethods(
-            @Nullable @NonnullElements final Collection<AuthenticationContextClassReferencePrincipal> contexts) {
+            @Nullable @NonnullElements final Collection<Principal> contexts) {
         if (contexts != null) {
-            defaultAuthenticationContextsLookupStrategy = FunctionSupport.constant(List.copyOf(contexts));
+            defaultAuthenticationContextsLookupStrategy =
+                    FunctionSupport.constant(CollectionSupport.copyToList(contexts));
         } else {
             defaultAuthenticationContextsLookupStrategy = FunctionSupport.constant(null);
         }
@@ -380,7 +379,7 @@ public abstract class AbstractOAuth2ClientAuthenticableProfileConfiguration
      * @param strategy  lookup strategy
      */
     public void setDefaultAuthenticationMethodsLookupStrategy(
-            @Nonnull final Function<ProfileRequestContext,Collection<AuthenticationContextClassReferencePrincipal>>
+            @Nonnull final Function<ProfileRequestContext,Collection<Principal>>
             strategy) {
         defaultAuthenticationContextsLookupStrategy = Constraint.isNotNull(strategy, "Lookup strategy cannot be null");
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.