[java-oidc-common] branch main updated: Relocate/rename token profile class.

[Scott Cantor]

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

scantor 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=f0e235cd82a0278656f264738eae5b8cab60972f

The following commit(s) were added to refs/heads/main by this push:
     new f0e235c  Relocate/rename token profile class.
f0e235c is described below

commit f0e235cd82a0278656f264738eae5b8cab60972f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 16 13:12:26 2022 -0500

    Relocate/rename token profile class.
---
 .../profile/config/navigate/GrantTypesLookupFunction.java     |  8 ++++----
 .../config/OAuth2TokenConfiguration.java}                     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

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 39dbb8f..72f8c9d 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
@@ -30,11 +30,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.profile.config.OIDCAuthorizationConfiguration;
-import net.shibboleth.oidc.profile.config.OIDCTokenConfiguration;
+import net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenConfiguration;
 
 /**
  * A function that obtains
- * {@link OIDCTokenConfiguration#getGrantTypes(ProfileRequestContext)}
+ * {@link OAuth2TokenConfiguration#getGrantTypes(ProfileRequestContext)}
  * if such a profile is available from a {@link RelyingPartyContext} obtained via a lookup function,
  * by default a child of the {@link ProfileRequestContext}. That result is then transformed into a list
  * of {@link GrantType}s.
@@ -48,8 +48,8 @@ public class GrantTypesLookupFunction extends AbstractRelyingPartyLookupFunction
         final RelyingPartyContext rpc = getRelyingPartyContextLookupStrategy().apply(input);
         if (rpc != null) {
             final ProfileConfiguration pc = rpc.getProfileConfig();
-            if (pc instanceof OIDCTokenConfiguration) {
-                final Set<String> types = ((OIDCTokenConfiguration)pc).getGrantTypes(input);
+            if (pc instanceof OAuth2TokenConfiguration) {
+                final Set<String> types = ((OAuth2TokenConfiguration)pc).getGrantTypes(input);
                 if (types != null) {
                     return types.stream()
                             .map(GrantType::new)
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
similarity index 91%
rename from oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java
rename to oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
index db45e82..2375ef2 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCTokenConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2TokenConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package net.shibboleth.oidc.profile.config;
+package net.shibboleth.oidc.profile.oauth2.config;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -29,6 +29,7 @@ import org.opensaml.profile.context.ProfileRequestContext;
 
 import com.nimbusds.oauth2.sdk.GrantType;
 
+import net.shibboleth.oidc.profile.config.AbstractOIDCSSOConfiguration;
 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;
@@ -40,10 +41,10 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 /**
  * OIDC-aware OAuth 2 token endpoint profile configuration.
  */
-public class OIDCTokenConfiguration extends AbstractOIDCSSOConfiguration {
+public class OAuth2TokenConfiguration extends AbstractOIDCSSOConfiguration {
 
     /** ID for this profile configuration. */
-    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/token";
+    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/token";
 
     /** Enabled grant types. */
     @Nonnull private Function<ProfileRequestContext,Set<String>> grantTypesLookupStrategy;
@@ -51,7 +52,7 @@ public class OIDCTokenConfiguration extends AbstractOIDCSSOConfiguration {
     /**
      * Constructor.
      */
-    public OIDCTokenConfiguration() {
+    public OAuth2TokenConfiguration() {
         this(PROFILE_ID);
         
         grantTypesLookupStrategy = FunctionSupport.constant(
@@ -63,7 +64,7 @@ public class OIDCTokenConfiguration extends AbstractOIDCSSOConfiguration {
      *
      * @param profileId unique profile identifier
      */
-    public OIDCTokenConfiguration(@Nonnull @NotEmpty final String profileId) {
+    public OAuth2TokenConfiguration(@Nonnull @NotEmpty final String profileId) {
         super(profileId);
     }
 

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