[java-oidc-common] branch dev/JCOMOIDC-66 updated: Change interface names to be compatible with existing concrete classes
Phil Smart
philip.smart at jisc.ac.uk
Mon Mar 27 14:09:52 UTC 2023
This is an automated email from the git hooks/post-receive script.
philsmart pushed a commit to branch dev/JCOMOIDC-66
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=a3ae2432f9e71e81f5b72d9b19a1df49aa81d5f0
The following commit(s) were added to refs/heads/dev/JCOMOIDC-66 by this push:
new a3ae243 Change interface names to be compatible with existing concrete classes
a3ae243 is described below
commit a3ae2432f9e71e81f5b72d9b19a1df49aa81d5f0
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Mar 27 15:09:46 2023 +0100
Change interface names to be compatible with existing concrete classes
- Create 'default' versions of the concrete classes
---
...uration.java => OIDCAuthorizationConfiguration.java} | 8 +++++++-
...n.java => OIDCDynamicRegistrationConfiguration.java} | 2 +-
.../oidc/profile/config/OIDCProfileConfiguration.java | 6 ------
...n.java => OIDCProviderInformationConfiguration.java} | 2 +-
...uration.java => OIDCPublishKeySetConfiguration.java} | 2 +-
.../profile/config/OIDCSSOProviderConfiguration.java | 4 ++--
...onfiguration.java => OIDCUserInfoConfiguration.java} | 2 +-
.../profile/config/logic/EncodeConsentPredicate.java | 6 +++---
.../logic/EnforceRefreshTokenRotationPredicate.java | 8 ++++----
.../IncludeIssuerInAuthenticationResponsePredicate.java | 6 +++---
.../navigate/AccessTokenLifetimeLookupFunction.java | 2 +-
.../config/navigate/AccessTokenTypeLookupFunction.java | 2 +-
.../navigate/AcrClaimAlwaysEssentialLookupFunction.java | 6 +++---
.../DeniedUserInfoAttributesLookupFunction.java | 14 +++++++-------
.../config/navigate/GrantTypesLookupFunction.java | 10 +++++-----
...okenClaimsSetManipulationStrategyLookupFunction.java | 8 ++++----
.../RegistrationMetadataPolicyLookupFunction.java | 8 ++++----
.../RegistrationValidityPeriodLookupFunction.java | 8 ++++----
.../navigate/RevocationLifetimeLookupFunction.java | 8 ++++----
.../config/navigate/RevocationMethodLookupFunction.java | 11 ++++++-----
.../navigate/SecretExpirationPeriodLookupFunction.java | 8 ++++----
...ation.java => OAuth2TokenAudienceConfiguration.java} | 2 +-
...Configuration.java => OAuth2TokenConfiguration.java} | 2 +-
....java => OAuth2TokenIntrospectionConfiguration.java} | 2 +-
...ion.java => OAuth2TokenRevocationConfiguration.java} | 2 +-
.../config/impl/AbstractOIDCSSOConfiguration.java | 5 +++++
....java => DefaultOIDCAuthorizationConfiguration.java} | 10 +++++-----
...=> DefaultOIDCDynamicRegistrationConfiguration.java} | 10 +++++-----
...=> DefaultOIDCProviderInformationConfiguration.java} | 10 +++++-----
....java => DefaultOIDCPublishKeySetConfiguration.java} | 17 ++++++++++++-----
...ation.java => DefaultOIDCUserInfoConfiguration.java} | 12 ++++++------
.../oidc/profile/config/impl/TestInterfaces.java | 2 +-
.../AuthenticationRequestMessageEncoderFactory.java | 2 +-
.../profile/impl/PopulateJWTDecryptionParameters.java | 2 +-
.../profile/impl/PopulateJWTEncryptionParameters.java | 2 +-
.../PopulateJWTSignatureSigningParametersHandler.java | 2 +-
...ava => DefaultOAuth2TokenAudienceConfiguration.java} | 10 +++++-----
...ration.java => DefaultOAuth2TokenConfiguration.java} | 10 +++++-----
...> DefaultOAuth2TokenIntrospectionConfiguration.java} | 10 +++++-----
...a => DefaultOAuth2TokenRevocationConfiguration.java} | 11 ++++++-----
.../config/impl/OIDCCoreProtocolConfigurationTest.java | 6 +++---
.../AuthenticationRequestMessageEncoderFactoryTest.java | 10 +++++-----
.../impl/FormOutboundKeySetResponseMessageTest.java | 6 +++---
.../impl/OAuth2TokenRevocationConfigurationTest.java | 13 +++++--------
44 files changed, 150 insertions(+), 139 deletions(-)
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProviderProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
similarity index 88%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProviderProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
index aa1daf9..865a4dd 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProviderProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
@@ -29,18 +29,24 @@ import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationCodeProducingProfileConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenEndpointProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
/**
* Configuration of an OIDC 1.0 authentication request.
*
* <p>This is specific to the role of the OpenID Provider (OP).</p>
+ *
+ * <p>Note, the name is compatible with previous versions of the OP plugin and will change in future version.</p>
*/
-public interface OIDCAuthenticationProviderProfileConfiguration extends OIDCAuthenticationProfileConfiguration,
+public interface OIDCAuthorizationConfiguration extends OIDCAuthenticationProfileConfiguration,
OAuth2AuthorizationCodeProducingProfileConfiguration, AuthenticationProfileConfiguration,
OverriddenIssuerProfileConfiguration, OAuth2TokenEndpointProfileConfiguration,
OIDCSSOProviderConfiguration {
+ /** ID for this profile configuration. */
+ @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";
+
/**
* Get whether all acr claim requests should be treated as Essential.
*
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
similarity index 96%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
index 3fb2247..764b94e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCDynamicRegistrationConfiguration.java
@@ -32,7 +32,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
/**
* Configuration of OpenID Connect Dynamic Client Registration 1.0.
*/
-public interface OIDCDynamicRegistrationProfileConfiguration extends OverriddenIssuerProfileConfiguration,
+public interface OIDCDynamicRegistrationConfiguration extends OverriddenIssuerProfileConfiguration,
OIDCFlowAwareProfileConfiguration, OAuth2ClientAuthenticableProfileConfiguration {
/** OIDC base protocol URI. */
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
index cbad257..d70dcdc 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProfileConfiguration.java
@@ -17,16 +17,10 @@
package net.shibboleth.oidc.profile.config;
-import javax.annotation.Nonnull;
-
import net.shibboleth.oidc.profile.oauth2.config.OAuth2ProfileConfiguration;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/** Common interface for OpenID Connect 1.0 Profile Configurations.*/
public interface OIDCProfileConfiguration extends OAuth2ProfileConfiguration {
- /** OIDC base protocol URI. */
- @Nonnull @NotEmpty
- public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationConfiguration.java
similarity index 92%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationConfiguration.java
index cd55139..cdb18ff 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCProviderInformationConfiguration.java
@@ -20,7 +20,7 @@ package net.shibboleth.oidc.profile.config;
import net.shibboleth.idp.profile.config.OverriddenIssuerProfileConfiguration;
/** OpenID Connect Provider Configuration.*/
-public interface OIDCProviderInformationProfileConfiguration extends OverriddenIssuerProfileConfiguration,
+public interface OIDCProviderInformationConfiguration extends OverriddenIssuerProfileConfiguration,
OIDCProfileConfiguration {
/** OIDC base protocol URI. Section 4 is relevant. */
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetConfiguration.java
similarity index 93%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetConfiguration.java
index 1db1b92..f531763 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCPublishKeySetConfiguration.java
@@ -20,7 +20,7 @@ package net.shibboleth.oidc.profile.config;
/**
* Configuration of an OpenID published key set document.
*/
-public interface OIDCPublishKeySetProfileConfiguration extends OIDCProfileConfiguration {
+public interface OIDCPublishKeySetConfiguration extends OIDCProfileConfiguration {
/** OIDC base protocol URI. Section 3 jwks_uri is the relevant. */
public static final String PROTOCOL_URI =
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
index 7880669..b0aaa28 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCSSOProviderConfiguration.java
@@ -29,6 +29,6 @@ public interface OIDCSSOProviderConfiguration extends OIDCTokenEncryptionProfile
OIDCIDTokenProducingProfileConfiguration, OAuth2AccessTokenProducingProfileConfiguration,
OAuth2RefreshTokenProducingProfileConfiguration, OIDCSSOProfileConfiguration,
AttributeResolvingProfileConfiguration, OIDCFlowAwareProfileConfiguration,
- OAuth2ClientAuthenticableProfileConfiguration{
+ OAuth2ClientAuthenticableProfileConfiguration {
-}
+}
\ No newline at end of file
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
similarity index 96%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
index 789fc17..49013e5 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCUserInfoConfiguration.java
@@ -33,7 +33,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
/**
* Configuration for an OpenID Connect core protocol UserInfo endpoint.
*/
-public interface OIDCUserInfoProfileConfiguration extends AttributeResolvingProfileConfiguration,
+public interface OIDCUserInfoConfiguration extends AttributeResolvingProfileConfiguration,
OIDCTokenEncryptionProfileConfiguration, OAuth2TokenValidatingProfileConfiguration {
/** OIDC base protocol URI. */
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
index fc7984a..8bd9610 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EncodeConsentPredicate.java
@@ -24,7 +24,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A predicate implementation that forwards to
@@ -38,8 +38,8 @@ public class EncodeConsentPredicate extends AbstractRelyingPartyPredicate {
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCAuthenticationProviderProfileConfiguration) {
- return ((OIDCAuthenticationProviderProfileConfiguration) pc).isEncodeConsentInTokens(input);
+ if (pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isEncodeConsentInTokens(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EnforceRefreshTokenRotationPredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EnforceRefreshTokenRotationPredicate.java
index b5bf360..8144af5 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EnforceRefreshTokenRotationPredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/EnforceRefreshTokenRotationPredicate.java
@@ -24,11 +24,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
/**
* A predicate implementation that forwards to
- * {@link OAuth2TokenProfileConfiguration#isEnforceRefreshTokenRotation(ProfileRequestContext)}.
+ * {@link OAuth2TokenConfiguration#isEnforceRefreshTokenRotation(ProfileRequestContext)}.
*/
public class EnforceRefreshTokenRotationPredicate extends AbstractRelyingPartyPredicate {
@@ -38,8 +38,8 @@ public class EnforceRefreshTokenRotationPredicate extends AbstractRelyingPartyPr
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OAuth2TokenProfileConfiguration) {
- return ((OAuth2TokenProfileConfiguration) pc).isEnforceRefreshTokenRotation(input);
+ if (pc instanceof OAuth2TokenConfiguration) {
+ return ((OAuth2TokenConfiguration) pc).isEnforceRefreshTokenRotation(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/IncludeIssuerInAuthenticationResponsePredicate.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/IncludeIssuerInAuthenticationResponsePredicate.java
index 922ace4..dd88b2e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/IncludeIssuerInAuthenticationResponsePredicate.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/logic/IncludeIssuerInAuthenticationResponsePredicate.java
@@ -24,7 +24,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A predicate implementation that forwards to
@@ -40,8 +40,8 @@ public class IncludeIssuerInAuthenticationResponsePredicate extends AbstractRely
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCAuthenticationProviderProfileConfiguration) {
- return ((OIDCAuthenticationProviderProfileConfiguration) pc).isIncludeIssuerInResponse(input);
+ if (pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isIncludeIssuerInResponse(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
index e76cfb6..bdface3 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenLifetimeLookupFunction.java
@@ -30,7 +30,7 @@ import net.shibboleth.oidc.profile.oauth2.config.OAuth2AccessTokenProducingProfi
/**
* A function that returns
- * {@link OAuth2TokenAudienceConfiguration#getAccessTokenLifetime(ProfileRequestContext)}
+ * {@link OAuth2AccessTokenProducingProfileConfiguration#getAccessTokenLifetime(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
index 89d39e4..a23253e 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AccessTokenTypeLookupFunction.java
@@ -29,7 +29,7 @@ import net.shibboleth.oidc.profile.oauth2.config.OAuth2AccessTokenProducingProfi
/**
* A function that returns
- * {@link OAuth2TokenAudienceConfiguration#getAccessTokenType(ProfileRequestContext)}
+ * {@link OAuth2AccessTokenProducingProfileConfiguration#getAccessTokenType(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
index 08df9ac..b7df1de 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/AcrClaimAlwaysEssentialLookupFunction.java
@@ -24,7 +24,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.logic.AbstractRelyingPartyPredicate;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
/**
* A predicate that returns
@@ -44,8 +44,8 @@ public class AcrClaimAlwaysEssentialLookupFunction extends AbstractRelyingPartyP
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCAuthenticationProviderProfileConfiguration) {
- return ((OIDCAuthenticationProviderProfileConfiguration) pc).isAcrRequestAlwaysEssential(input);
+ if (pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration) pc).isAcrRequestAlwaysEssential(input);
}
}
return false;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
index ae4f33e..780f31f 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/DeniedUserInfoAttributesLookupFunction.java
@@ -26,13 +26,13 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCUserInfoProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration;
/**
* A function that obtains
* {@link OIDCAuthenticationProviderProfileConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)} or
- * {@link OIDCUserInfoProfileConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)}
+ * {@link OIDCUserInfoConfiguration#getDeniedUserInfoAttributes(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -47,10 +47,10 @@ public class DeniedUserInfoAttributesLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCAuthenticationProviderProfileConfiguration) {
- return ((OIDCAuthenticationProviderProfileConfiguration)pc).getDeniedUserInfoAttributes(input);
- } else if (pc instanceof OIDCUserInfoProfileConfiguration) {
- return ((OIDCUserInfoProfileConfiguration) pc).getDeniedUserInfoAttributes(input);
+ if (pc instanceof OIDCAuthorizationConfiguration) {
+ return ((OIDCAuthorizationConfiguration)pc).getDeniedUserInfoAttributes(input);
+ } else if (pc instanceof OIDCUserInfoConfiguration) {
+ return ((OIDCUserInfoConfiguration) pc).getDeniedUserInfoAttributes(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/GrantTypesLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/GrantTypesLookupFunction.java
index d4c0e81..2c175cc 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/GrantTypesLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/GrantTypesLookupFunction.java
@@ -29,8 +29,8 @@ import com.nimbusds.oauth2.sdk.GrantType;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
/**
@@ -50,14 +50,14 @@ public class GrantTypesLookupFunction extends AbstractRelyingPartyLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OAuth2TokenProfileConfiguration) {
- final Set<String> types = ((OAuth2TokenProfileConfiguration)pc).getGrantTypes(input);
+ if (pc instanceof OAuth2TokenConfiguration) {
+ final Set<String> types = ((OAuth2TokenConfiguration)pc).getGrantTypes(input);
if (types != null) {
return types.stream()
.map(GrantType::new)
.collect(Collectors.toUnmodifiableSet());
}
- } else if (pc instanceof OIDCAuthenticationProviderProfileConfiguration) {
+ } else if (pc instanceof OIDCAuthorizationConfiguration) {
// For compatibility just return the lone supported type.
return Set.of(GrantType.AUTHORIZATION_CODE, GrantType.REFRESH_TOKEN);
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenClaimsSetManipulationStrategyLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenClaimsSetManipulationStrategyLookupFunction.java
index 95fd4cf..2fb9ca7 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenClaimsSetManipulationStrategyLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RefreshTokenClaimsSetManipulationStrategyLookupFunction.java
@@ -27,11 +27,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
/**
* A function that returns
- * {@link OAuth2TokenProfileConfiguration#getRefreshTokenClaimsSetManipulationStrategy(ProfileRequestContext)}
+ * {@link OAuth2TokenConfiguration#getRefreshTokenClaimsSetManipulationStrategy(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -49,8 +49,8 @@ public class RefreshTokenClaimsSetManipulationStrategyLookupFunction extends
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OAuth2TokenProfileConfiguration) {
- return ((OAuth2TokenProfileConfiguration) pc).getRefreshTokenClaimsSetManipulationStrategy(input);
+ if (pc instanceof OAuth2TokenConfiguration) {
+ return ((OAuth2TokenConfiguration) pc).getRefreshTokenClaimsSetManipulationStrategy(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationMetadataPolicyLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationMetadataPolicyLookupFunction.java
index d2461bb..314fc86 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationMetadataPolicyLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationMetadataPolicyLookupFunction.java
@@ -27,11 +27,11 @@ import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
-import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration;
/**
* A function that returns
- * {@link OIDCDynamicRegistrationProfileConfiguration#getMetadataPolicy(ProfileRequestContext)}
+ * {@link OIDCDynamicRegistrationConfiguration#getMetadataPolicy(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -46,8 +46,8 @@ public class RegistrationMetadataPolicyLookupFunction
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCDynamicRegistrationProfileConfiguration) {
- return ((OIDCDynamicRegistrationProfileConfiguration) pc).getMetadataPolicy(input);
+ if (pc instanceof OIDCDynamicRegistrationConfiguration) {
+ return ((OIDCDynamicRegistrationConfiguration) pc).getMetadataPolicy(input);
}
}
return null;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationValidityPeriodLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationValidityPeriodLookupFunction.java
index 5be9fe6..63011be 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationValidityPeriodLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RegistrationValidityPeriodLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration;
/**
* A function that returns
- * {@link OIDCDynamicRegistrationProfileConfiguration#getRegistrationValidityPeriod(ProfileRequestContext)}
+ * {@link OIDCDynamicRegistrationConfiguration#getRegistrationValidityPeriod(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -44,8 +44,8 @@ public class RegistrationValidityPeriodLookupFunction extends AbstractRelyingPar
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCDynamicRegistrationProfileConfiguration) {
- return ((OIDCDynamicRegistrationProfileConfiguration) pc).getRegistrationValidityPeriod(input);
+ if (pc instanceof OIDCDynamicRegistrationConfiguration) {
+ return ((OIDCDynamicRegistrationConfiguration) pc).getRegistrationValidityPeriod(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationLifetimeLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationLifetimeLookupFunction.java
index 63d00c3..1417a93 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationLifetimeLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationLifetimeLookupFunction.java
@@ -26,7 +26,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration;
/**
* A function that returns
@@ -59,9 +59,9 @@ public class RevocationLifetimeLookupFunction extends AbstractRelyingPartyLookup
if (rpc != null) {
final ProfileConfiguration pc = activeProfileOnly ? rpc.getProfileConfig() :
rpc.getConfiguration()
- .getProfileConfiguration(input, OAuth2TokenRevocationProfileConfiguration.PROFILE_ID);
- if (pc instanceof OAuth2TokenRevocationProfileConfiguration) {
- return ((OAuth2TokenRevocationProfileConfiguration) pc).getRevocationLifetime(input);
+ .getProfileConfiguration(input, OAuth2TokenRevocationConfiguration.PROFILE_ID);
+ if (pc instanceof OAuth2TokenRevocationConfiguration) {
+ return ((OAuth2TokenRevocationConfiguration) pc).getRevocationLifetime(input);
}
}
return null;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationMethodLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationMethodLookupFunction.java
index bf32e6c..355af53 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationMethodLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/RevocationMethodLookupFunction.java
@@ -24,12 +24,13 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationProfileConfiguration.OAuth2TokenRevocationMethod;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration.OAuth2TokenRevocationMethod;
+
/**
* A function that returns
- * {@link OAuth2TokenRevocationProfileConfiguration#getRevocationMethod(ProfileRequestContext)}
+ * {@link OAuth2TokenRevocationConfiguration#getRevocationMethod(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -45,8 +46,8 @@ public class RevocationMethodLookupFunction extends AbstractRelyingPartyLookupFu
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OAuth2TokenRevocationProfileConfiguration) {
- return ((OAuth2TokenRevocationProfileConfiguration) pc).getRevocationMethod(input);
+ if (pc instanceof OAuth2TokenRevocationConfiguration) {
+ return ((OAuth2TokenRevocationConfiguration) pc).getRevocationMethod(input);
}
}
return null;
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/SecretExpirationPeriodLookupFunction.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/SecretExpirationPeriodLookupFunction.java
index b224d96..fbe17b0 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/SecretExpirationPeriodLookupFunction.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/navigate/SecretExpirationPeriodLookupFunction.java
@@ -26,11 +26,11 @@ import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.ProfileConfiguration;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.idp.profile.context.navigate.AbstractRelyingPartyLookupFunction;
-import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration;
/**
* A function that returns
- * {@link OIDCDynamicRegistrationProfileConfiguration#getSecretExpirationPeriod(ProfileRequestContext)}
+ * {@link OIDCDynamicRegistrationConfiguration#getSecretExpirationPeriod(ProfileRequestContext)}
* if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
* by default a child of the {@link ProfileRequestContext}.
*
@@ -44,8 +44,8 @@ public class SecretExpirationPeriodLookupFunction extends AbstractRelyingPartyLo
final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
if (rpc != null) {
final ProfileConfiguration pc = rpc.getProfileConfig();
- if (pc instanceof OIDCDynamicRegistrationProfileConfiguration) {
- return ((OIDCDynamicRegistrationProfileConfiguration) pc).getSecretExpirationPeriod(input);
+ if (pc instanceof OIDCDynamicRegistrationConfiguration) {
+ return ((OIDCDynamicRegistrationConfiguration) pc).getSecretExpirationPeriod(input);
}
}
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
similarity index 94%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
index 25186e7..fbb124d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenAudienceConfiguration.java
@@ -30,7 +30,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
* <p>This applies to behaviour controlling the characteristics of tokens issued
* to the parties intended to process them, as distinct from the clients that use them.</p>
*/
-public interface OAuth2TokenAudienceProfileConfiguration extends OIDCTokenEncryptionProfileConfiguration,
+public interface OAuth2TokenAudienceConfiguration extends OIDCTokenEncryptionProfileConfiguration,
OverriddenIssuerProfileConfiguration, OAuth2AccessTokenProducingProfileConfiguration,
AttributeResolvingProfileConfiguration {
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
similarity index 96%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
index 18f9e5f..53c6010 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
@@ -35,7 +35,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
/**
* OIDC-aware OAuth 2.0 token endpoint profile configuration.
*/
-public interface OAuth2TokenProfileConfiguration extends OIDCSSOProviderConfiguration {
+public interface OAuth2TokenConfiguration extends OIDCSSOProviderConfiguration {
/** ID for this profile configuration. */
@Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/token";
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
similarity index 92%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
index 9466449..eeb0c1d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
@@ -24,7 +24,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Profile configuration for OAuth2 Token Introspection.
*/
-public interface OAuth2TokenIntrospectionProfileConfiguration extends OAuth2TokenValidatingProfileConfiguration,
+public interface OAuth2TokenIntrospectionConfiguration extends OAuth2TokenValidatingProfileConfiguration,
OAuth2ProfileConfiguration {
/** OAuth2 Token Revocation URI. */
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
similarity index 96%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
index 71bfd3b..0e566fe 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenRevocationConfiguration.java
@@ -31,7 +31,7 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
/**
* Configuration for the OAuth 2.0 Token Revocation profile.
*/
-public interface OAuth2TokenRevocationProfileConfiguration extends OAuth2TokenValidatingProfileConfiguration {
+public interface OAuth2TokenRevocationConfiguration extends OAuth2TokenValidatingProfileConfiguration {
/** OAuth2 Token Revocation URI. */
@Nonnull @NotEmpty public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7009";
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/AbstractOIDCSSOConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/AbstractOIDCSSOConfiguration.java
index 8c7dfd0..61829f0 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/AbstractOIDCSSOConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/AbstractOIDCSSOConfiguration.java
@@ -49,6 +49,11 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
*/
public abstract class AbstractOIDCSSOConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
implements OIDCSSORelyingPartyConfiguration, OIDCSSOProviderConfiguration {
+
+ //TODO move to interface?
+ /** OIDC base protocol URI. */
+ @Nonnull @NotEmpty
+ public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
similarity index 98%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
index 2696ef1..469fe36 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCAuthorizationConfiguration.java
@@ -34,8 +34,8 @@ import org.opensaml.profile.context.ProfileRequestContext;
import com.google.common.base.Predicates;
-import net.shibboleth.oidc.profile.config.OIDCAuthenticationProviderProfileConfiguration;
import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.config.OIDCSSOProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -51,9 +51,9 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
*
* <p>It is also usable as a Token endpoint configuration if no non-OIDC use cases are needed.</p>
*/
-public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
+public class DefaultOIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
implements OIDCAuthenticationRelyingPartyProfileConfiguration,
- OIDCAuthenticationProviderProfileConfiguration {
+ OIDCAuthorizationConfiguration {
/** Whether all acr claim requests should be treated as Essential. */
@Nonnull private Predicate<ProfileRequestContext> acrRequestAlwaysEssentialPredicate;
@@ -134,7 +134,7 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
/**
* Constructor.
*/
- public OIDCAuthorizationConfiguration() {
+ public DefaultOIDCAuthorizationConfiguration() {
this(OIDCSSOProfileConfiguration.PROFILE_ID);
}
@@ -143,7 +143,7 @@ public class OIDCAuthorizationConfiguration extends AbstractOIDCSSOConfiguration
*
* @param profileId Unique profile identifier.
*/
- public OIDCAuthorizationConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOIDCAuthorizationConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
redirectUriOverrideLookupStrategy = FunctionSupport.constant(null);
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
similarity index 95%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
index 0a8c158..7fab902 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCDynamicRegistrationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCDynamicRegistrationConfiguration.java
@@ -27,7 +27,7 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
-import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCDynamicRegistrationConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2FlowAwareProfileConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -37,8 +37,8 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
/**
* Implemenation of a profile configuration for the OpenID Connect dynamic client registration.
*/
-public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
- implements OIDCDynamicRegistrationProfileConfiguration {
+public class DefaultOIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwareProfileConfiguration
+ implements OIDCDynamicRegistrationConfiguration {
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
@@ -55,7 +55,7 @@ public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwar
/**
* Constructor.
*/
- public OIDCDynamicRegistrationConfiguration() {
+ public DefaultOIDCDynamicRegistrationConfiguration() {
this(PROFILE_ID);
}
@@ -64,7 +64,7 @@ public class OIDCDynamicRegistrationConfiguration extends AbstractOAuth2FlowAwar
*
* @param profileId Unique profile identifier.
*/
- public OIDCDynamicRegistrationConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOIDCDynamicRegistrationConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
issuerLookupStrategy = FunctionSupport.constant(null);
setRegistrationValidityPeriod(Duration.ofHours(24));
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
similarity index 89%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
index 4bd176f..d379eed 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCProviderInformationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCProviderInformationConfiguration.java
@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
import net.shibboleth.idp.profile.config.AbstractConditionalProfileConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCProviderInformationProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCProviderInformationConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.logic.FunctionSupport;
@@ -33,8 +33,8 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
/**
* Implementation of a profile configuration for the OpenID Connect Provider Configuration.
*/
-public class OIDCProviderInformationConfiguration extends AbstractConditionalProfileConfiguration
- implements OIDCProviderInformationProfileConfiguration {
+public class DefaultOIDCProviderInformationConfiguration extends AbstractConditionalProfileConfiguration
+ implements OIDCProviderInformationConfiguration {
/** Lookup function to override issuer value. */
@Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
@@ -42,7 +42,7 @@ public class OIDCProviderInformationConfiguration extends AbstractConditionalPro
/**
* Constructor.
*/
- public OIDCProviderInformationConfiguration() {
+ public DefaultOIDCProviderInformationConfiguration() {
this(PROFILE_ID);
}
@@ -51,7 +51,7 @@ public class OIDCProviderInformationConfiguration extends AbstractConditionalPro
*
* @param profileId Unique profile identifier.
*/
- public OIDCProviderInformationConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOIDCProviderInformationConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
issuerLookupStrategy = FunctionSupport.constant(null);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCPublishKeySetConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
similarity index 67%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCPublishKeySetConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
index 06ac6e8..3d5b7ff 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCPublishKeySetConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCPublishKeySetConfiguration.java
@@ -20,19 +20,26 @@ package net.shibboleth.oidc.profile.config.impl;
import javax.annotation.Nonnull;
import net.shibboleth.idp.profile.config.AbstractConditionalProfileConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCPublishKeySetProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Implementation of a profile configuration for publishing OP key set.
*/
-public class OIDCPublishKeySetConfiguration extends AbstractConditionalProfileConfiguration
- implements OIDCPublishKeySetProfileConfiguration {
+public class DefaultOIDCPublishKeySetConfiguration extends AbstractConditionalProfileConfiguration
+ implements OIDCPublishKeySetConfiguration {
+
+ /** OIDC base protocol URI. Section 3 jwks_uri is the relevant. */
+ public static final String PROTOCOL_URI =
+ "https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata";
+
+ /** ID for this profile configuration. */
+ public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/keyset";
/**
* Constructor.
*/
- public OIDCPublishKeySetConfiguration() {
+ public DefaultOIDCPublishKeySetConfiguration() {
this(PROFILE_ID);
}
@@ -41,7 +48,7 @@ public class OIDCPublishKeySetConfiguration extends AbstractConditionalProfileCo
*
* @param profileId Unique profile identifier.
*/
- public OIDCPublishKeySetConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOIDCPublishKeySetConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
similarity index 94%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
index 81add39..726da3b 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/OIDCUserInfoConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/DefaultOIDCUserInfoConfiguration.java
@@ -30,7 +30,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import com.google.common.base.Predicates;
-import net.shibboleth.oidc.profile.config.OIDCUserInfoProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration;
import net.shibboleth.oidc.profile.oauth2.config.impl.AbstractOAuth2TokenValidatingConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -43,8 +43,8 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
* Implementation of a profile configuration for the OpenID Connect core protocol userinfo endpoint.
*/
//TODO deniedUserInfoAttributesLookupStrategy is also common to OIDCUserInfoProfileConfiguration
-public class OIDCUserInfoConfiguration extends AbstractOAuth2TokenValidatingConfiguration
- implements OIDCUserInfoProfileConfiguration {
+public class DefaultOIDCUserInfoConfiguration extends AbstractOAuth2TokenValidatingConfiguration
+ implements OIDCUserInfoConfiguration {
/** Whether attributes should be resolved in the course of the profile. */
@Nonnull private Predicate<ProfileRequestContext> resolveAttributesPredicate;
@@ -58,8 +58,8 @@ public class OIDCUserInfoConfiguration extends AbstractOAuth2TokenValidatingConf
/**
* Constructor.
*/
- public OIDCUserInfoConfiguration() {
- this(OIDCUserInfoProfileConfiguration.PROFILE_ID);
+ public DefaultOIDCUserInfoConfiguration() {
+ this(OIDCUserInfoConfiguration.PROFILE_ID);
}
/**
@@ -67,7 +67,7 @@ public class OIDCUserInfoConfiguration extends AbstractOAuth2TokenValidatingConf
*
* @param profileId Unique profile identifier.
*/
- public OIDCUserInfoConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOIDCUserInfoConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
resolveAttributesPredicate = Predicates.alwaysTrue();
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
index 23966d8..defe0d1 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/config/impl/TestInterfaces.java
@@ -12,7 +12,7 @@ import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProfileC
public class TestInterfaces {
public static void main(final String args[]) {
- final var concreteClass = new OIDCAuthorizationConfiguration();
+ final var concreteClass = new DefaultOIDCAuthorizationConfiguration();
final Set<String> concreteNames = new HashSet<>();
for (final Method m: concreteClass.getClass().getMethods()) {
if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactory.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactory.java
index 853827d..7826423 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactory.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactory.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.oidc.profile.config.impl.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.encoding.OIDCMessageEncoder;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationProfileConfiguration.HttpRequestMethod;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
index 19a90df..956c331 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTDecryptionParameters.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.oidc.profile.config.impl.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.security.credential.ClientSecretCredential;
import net.shibboleth.oidc.security.jose.DecryptionConfiguration;
import net.shibboleth.oidc.security.jose.DecryptionParameters;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
index 94d9428..7659769 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTEncryptionParameters.java
@@ -41,7 +41,7 @@ import net.shibboleth.idp.profile.AbstractProfileAction;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
-import net.shibboleth.oidc.profile.config.impl.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.config.logic.EncryptionOptionalPredicate;
import net.shibboleth.oidc.security.credential.ClientSecretCredential;
import net.shibboleth.oidc.security.jose.EncryptionConfiguration;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
index 862b472..2f7c575 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/impl/PopulateJWTSignatureSigningParametersHandler.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
import net.shibboleth.oidc.metadata.context.OIDCMetadataContext;
import net.shibboleth.oidc.metadata.context.OIDCProviderMetadataContext;
-import net.shibboleth.oidc.profile.config.impl.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration;
import net.shibboleth.oidc.security.credential.ClientSecretCredential;
import net.shibboleth.oidc.security.jose.SignatureSigningConfiguration;
import net.shibboleth.oidc.security.jose.SignatureSigningParameters;
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenAudienceConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
similarity index 96%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenAudienceConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
index bacac03..8062e17 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenAudienceConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenAudienceConfiguration.java
@@ -31,7 +31,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import com.google.common.base.Predicates;
import net.shibboleth.idp.profile.config.AbstractConditionalProfileConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -41,8 +41,8 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Implementation of an OAuth 2.0 token "audience" profile configuration.
*/
-public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfileConfiguration
- implements OAuth2TokenAudienceProfileConfiguration {
+public class DefaultOAuth2TokenAudienceConfiguration extends AbstractConditionalProfileConfiguration
+ implements OAuth2TokenAudienceConfiguration {
/** Lookup function to override issuer value. */
@@ -66,7 +66,7 @@ public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfile
accessTokenClaimsSetManipulationStrategyLookupStrategy;
/** Constructor. */
- public OAuth2TokenAudienceConfiguration() {
+ public DefaultOAuth2TokenAudienceConfiguration() {
this(PROFILE_ID);
}
@@ -75,7 +75,7 @@ public class OAuth2TokenAudienceConfiguration extends AbstractConditionalProfile
*
* @param profileId Unique profile identifier.
*/
- public OAuth2TokenAudienceConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOAuth2TokenAudienceConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
issuerLookupStrategy = FunctionSupport.constant(null);
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
similarity index 94%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
index f14af80..294c98e 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenConfiguration.java
@@ -34,7 +34,7 @@ import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.GrantType;
import net.shibboleth.oidc.profile.config.impl.AbstractOIDCSSOConfiguration;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
@@ -46,7 +46,7 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
* Implementation of an OIDC-aware OAuth 2 token endpoint profile configuration.
*/
-public class OAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration implements OAuth2TokenProfileConfiguration {
+public class DefaultOAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration implements OAuth2TokenConfiguration {
/** Enabled grant types. */
@Nonnull private Function<ProfileRequestContext,Set<String>> grantTypesLookupStrategy;
@@ -62,8 +62,8 @@ public class OAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration imple
/**
* Constructor.
*/
- public OAuth2TokenConfiguration() {
- this(OAuth2TokenProfileConfiguration.PROFILE_ID);
+ public DefaultOAuth2TokenConfiguration() {
+ this(OAuth2TokenConfiguration.PROFILE_ID);
grantTypesLookupStrategy = FunctionSupport.constant(
Set.of(GrantType.AUTHORIZATION_CODE.toString(), GrantType.REFRESH_TOKEN.toString()));
@@ -76,7 +76,7 @@ public class OAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration imple
*
* @param profileId unique profile identifier
*/
- public OAuth2TokenConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOAuth2TokenConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenIntrospectionConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
similarity index 79%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenIntrospectionConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
index fbfe948..c722c88 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenIntrospectionConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenIntrospectionConfiguration.java
@@ -20,19 +20,19 @@ package net.shibboleth.oidc.profile.oauth2.config.impl;
import javax.annotation.Nonnull;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenIntrospectionProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenIntrospectionConfiguration;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/**
* Implementation of a profile configuration for the OAuth2 Token Introspection.
*/
-public class OAuth2TokenIntrospectionConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
- OAuth2TokenIntrospectionProfileConfiguration {
+public class DefaultOAuth2TokenIntrospectionConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
+ OAuth2TokenIntrospectionConfiguration {
/**
* Constructor.
*/
- public OAuth2TokenIntrospectionConfiguration() {
+ public DefaultOAuth2TokenIntrospectionConfiguration() {
this(PROFILE_ID);
}
@@ -41,7 +41,7 @@ public class OAuth2TokenIntrospectionConfiguration extends AbstractOAuth2TokenVa
*
* @param profileId Unique profile identifier.
*/
- public OAuth2TokenIntrospectionConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOAuth2TokenIntrospectionConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
}
diff --git a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfiguration.java b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
similarity index 91%
rename from oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfiguration.java
rename to oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
index 939f8ae..af7aec7 100644
--- a/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfiguration.java
+++ b/oidc-common-profile-impl/src/main/java/net/shibboleth/oidc/profile/oauth2/config/impl/DefaultOAuth2TokenRevocationConfiguration.java
@@ -25,7 +25,8 @@ import javax.annotation.Nullable;
import org.opensaml.profile.context.ProfileRequestContext;
-import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationProfileConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenRevocationConfiguration.OAuth2TokenRevocationMethod;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -35,8 +36,8 @@ import net.shibboleth.utilities.java.support.logic.FunctionSupport;
/**
* Implementation of a profile configuration for the OAuth2 Token Revocation.
*/
-public class OAuth2TokenRevocationConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
- OAuth2TokenRevocationProfileConfiguration {
+public class DefaultOAuth2TokenRevocationConfiguration extends AbstractOAuth2TokenValidatingConfiguration implements
+ OAuth2TokenRevocationConfiguration {
/**
* Which revocation method should be used when revoking a token.
@@ -50,7 +51,7 @@ public class OAuth2TokenRevocationConfiguration extends AbstractOAuth2TokenValid
/**
* Constructor.
*/
- public OAuth2TokenRevocationConfiguration() {
+ public DefaultOAuth2TokenRevocationConfiguration() {
this(PROFILE_ID);
revocationMethodLookupStrategy = FunctionSupport.constant(OAuth2TokenRevocationMethod.CHAIN.toString());
revocationLifetimeLookupStrategy = FunctionSupport.constant(Duration.ofHours(6));
@@ -61,7 +62,7 @@ public class OAuth2TokenRevocationConfiguration extends AbstractOAuth2TokenValid
*
* @param profileId Unique profile identifier.
*/
- public OAuth2TokenRevocationConfiguration(@Nonnull @NotEmpty final String profileId) {
+ public DefaultOAuth2TokenRevocationConfiguration(@Nonnull @NotEmpty final String profileId) {
super(profileId);
}
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/config/impl/OIDCCoreProtocolConfigurationTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/config/impl/OIDCCoreProtocolConfigurationTest.java
index 698e44c..457c969 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/config/impl/OIDCCoreProtocolConfigurationTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/config/impl/OIDCCoreProtocolConfigurationTest.java
@@ -30,15 +30,15 @@ import net.shibboleth.oidc.profile.config.OIDCSSOProfileConfiguration;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
/**
- * Unit tests for {@link OIDCAuthorizationConfiguration}.
+ * Unit tests for {@link DefaultOIDCAuthorizationConfiguration}.
*/
public class OIDCCoreProtocolConfigurationTest {
- private OIDCAuthorizationConfiguration config;
+ private DefaultOIDCAuthorizationConfiguration config;
@BeforeMethod
protected void setUp() throws Exception {
- config = new OIDCAuthorizationConfiguration();
+ config = new DefaultOIDCAuthorizationConfiguration();
config.setSecurityConfiguration(new SecurityConfiguration());
config.initialize();
}
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
index 7df4804..8e6e62f 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/AuthenticationRequestMessageEncoderFactoryTest.java
@@ -29,7 +29,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
import org.testng.annotations.Test;
import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.oidc.profile.config.impl.OIDCAuthorizationConfiguration;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCAuthorizationConfiguration;
import net.shibboleth.oidc.profile.encoding.OIDCMessageEncoder;
import net.shibboleth.oidc.profile.encoding.impl.AbstractOIDCMessageEncoder;
import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationProfileConfiguration.HttpRequestMethod;
@@ -71,7 +71,7 @@ public class AuthenticationRequestMessageEncoderFactoryTest {
final ProfileRequestContext prc = new ProfileRequestContext();
// mock a profile config to request form POST serialization
- final OIDCAuthorizationConfiguration config = new OIDCAuthorizationConfiguration();
+ final DefaultOIDCAuthorizationConfiguration config = new DefaultOIDCAuthorizationConfiguration();
config.setHttpRequestMethodLookupStrategy(rc -> HttpRequestMethod.POST.toString());
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class, true);
rpCtx.setProfileConfig(config);
@@ -102,7 +102,7 @@ public class AuthenticationRequestMessageEncoderFactoryTest {
final ProfileRequestContext prc = new ProfileRequestContext();
// mock a profile config to request form POST serialization
- final OIDCAuthorizationConfiguration config = new OIDCAuthorizationConfiguration();
+ final DefaultOIDCAuthorizationConfiguration config = new DefaultOIDCAuthorizationConfiguration();
config.setHttpRequestMethodLookupStrategy(rc -> HttpRequestMethod.GET.toString());
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class, true);
rpCtx.setProfileConfig(config);
@@ -134,7 +134,7 @@ public class AuthenticationRequestMessageEncoderFactoryTest {
final ProfileRequestContext prc = new ProfileRequestContext();
// mock a profile config to request form POST serialization
- final OIDCAuthorizationConfiguration config = new OIDCAuthorizationConfiguration();
+ final DefaultOIDCAuthorizationConfiguration config = new DefaultOIDCAuthorizationConfiguration();
config.setHttpRequestMethodLookupStrategy(rc -> HttpRequestMethod.POST.toString());
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class, true);
rpCtx.setProfileConfig(config);
@@ -151,7 +151,7 @@ public class AuthenticationRequestMessageEncoderFactoryTest {
final ProfileRequestContext prc = new ProfileRequestContext();
// mock a profile config to request form POST serialization
- final OIDCAuthorizationConfiguration config = new OIDCAuthorizationConfiguration();
+ final DefaultOIDCAuthorizationConfiguration config = new DefaultOIDCAuthorizationConfiguration();
config.setHttpRequestMethodLookupStrategy(rc -> null);
final RelyingPartyContext rpCtx = prc.getSubcontext(RelyingPartyContext.class, true);
rpCtx.setProfileConfig(config);
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
index 274446c..fa47b5f 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/impl/FormOutboundKeySetResponseMessageTest.java
@@ -46,7 +46,7 @@ import net.shibboleth.idp.profile.context.navigate.WebflowRequestContextProfileR
import net.shibboleth.idp.profile.testing.ActionTestingSupport;
import net.shibboleth.idp.profile.testing.RequestContextBuilder;
import net.shibboleth.oidc.profile.config.JSONSecurityConfiguration;
-import net.shibboleth.oidc.profile.config.impl.OIDCPublishKeySetConfiguration;
+import net.shibboleth.oidc.profile.config.impl.DefaultOIDCPublishKeySetConfiguration;
import net.shibboleth.oidc.profile.config.navigate.JWKCredentialsToPublishLookupStrategy;
import net.shibboleth.oidc.profile.messaging.JSONSuccessResponse;
import net.shibboleth.oidc.security.credential.BasicJWKCredentialFactoryBean;
@@ -68,7 +68,7 @@ public class FormOutboundKeySetResponseMessageTest {
private RequestContext requestCtx;
- private OIDCPublishKeySetConfiguration profileConf;
+ private DefaultOIDCPublishKeySetConfiguration profileConf;
private RelyingPartyContext rpCtx;
@@ -107,7 +107,7 @@ public class FormOutboundKeySetResponseMessageTest {
secConf.setJwtSignatureSigningConfiguration(signConfig);
secConf.setJwtDecryptionConfiguration(decConfig);
- profileConf = new OIDCPublishKeySetConfiguration();
+ profileConf = new DefaultOIDCPublishKeySetConfiguration();
profileConf.setSecurityConfiguration(secConf);
rpCtx.setProfileConfig(profileConf);
action = new FormOutboundKeySetResponseMessage();
diff --git a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfigurationTest.java b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfigurationTest.java
index 525edfd..b264627 100644
--- a/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfigurationTest.java
+++ b/oidc-common-profile-impl/src/test/java/net/shibboleth/oidc/profile/oauth2/config/impl/OAuth2TokenRevocationConfigurationTest.java
@@ -19,27 +19,24 @@ package net.shibboleth.oidc.profile.oauth2.config.impl;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-
-import net.shibboleth.oidc.profile.oauth2.config.impl.OAuth2TokenRevocationConfiguration;
-
import org.testng.Assert;
/**
- * Tests for {@link OAuth2TokenRevocationConfiguration}, tests only constructors.
+ * Tests for {@link DefaultOAuth2TokenRevocationConfiguration}, tests only constructors.
*/
public class OAuth2TokenRevocationConfigurationTest {
- private OAuth2TokenRevocationConfiguration conf;
+ private DefaultOAuth2TokenRevocationConfiguration conf;
@BeforeMethod
protected void setUp() throws Exception {
- conf = new OAuth2TokenRevocationConfiguration();
+ conf = new DefaultOAuth2TokenRevocationConfiguration();
}
@Test
public void test() {
- Assert.assertEquals(OAuth2TokenRevocationConfiguration.PROFILE_ID, conf.getId());
- conf = new OAuth2TokenRevocationConfiguration("somethingelse");
+ Assert.assertEquals(DefaultOAuth2TokenRevocationConfiguration.PROFILE_ID, conf.getId());
+ conf = new DefaultOAuth2TokenRevocationConfiguration("somethingelse");
Assert.assertEquals("somethingelse", conf.getId());
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list