[java-oidc-common] branch dev/JCOMOIDC-66 updated: Move profile ID to OIDC authentication profile interface

[Phil Smart]

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=0eace34af28be0b240a748e6e4889240a084e9ad

The following commit(s) were added to refs/heads/dev/JCOMOIDC-66 by this push:
     new 0eace34  Move profile ID to OIDC authentication profile interface
0eace34 is described below

commit 0eace34af28be0b240a748e6e4889240a084e9ad
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Mon Mar 27 10:34:26 2023 +0100

    Move profile ID to OIDC authentication profile interface
---
 .../profile/config/OIDCAuthenticationProfileConfiguration.java   | 6 +++++-
 .../oauth2/config/OAuth2AuthorizationProfileConfiguration.java   | 4 ----
 .../net/shibboleth/oidc/profile/config/impl/TestInterfaces.java  | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
index c160dc2..88153ef 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthenticationProfileConfiguration.java
@@ -22,15 +22,19 @@ import java.time.Duration;
 import java.util.Collection;
 import java.util.function.Function;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationProfileConfiguration;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
 /** Generic configuration for an OIDC 1.0 authentication request.*/
-public interface OIDCAuthenticationProfileConfiguration extends OAuth2AuthorizationProfileConfiguration {    
+public interface OIDCAuthenticationProfileConfiguration extends OAuth2AuthorizationProfileConfiguration {
     
+    /** ID for this profile configuration. */
+    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";    
     
     /**
      * Get the function used to translate AMRs in the id_token into an appropriate set of
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationProfileConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationProfileConfiguration.java
index cc46f73..1c29508 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationProfileConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/oauth2/config/OAuth2AuthorizationProfileConfiguration.java
@@ -19,7 +19,6 @@ package net.shibboleth.oidc.profile.oauth2.config;
 
 import java.util.Set;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import org.opensaml.profile.context.ProfileRequestContext;
@@ -37,9 +36,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
  */
 public interface OAuth2AuthorizationProfileConfiguration {
     
-    /** ID for this profile configuration. */
-    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";
-    
     /** Enumeration of the HTTP methods used in various OAuth requests.*/
     public enum HttpRequestMethod {
         /**
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 67a1f46..23966d8 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
@@ -7,12 +7,12 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import net.shibboleth.oidc.profile.config.OIDCUserInfoProfileConfiguration;
+import net.shibboleth.oidc.profile.config.OIDCAuthenticationRelyingPartyProfileConfiguration;
 
 public class TestInterfaces {
     
     public static void main(final String args[]) {
-        final var concreteClass = new OIDCUserInfoConfiguration();
+        final var concreteClass = new OIDCAuthorizationConfiguration();
         final Set<String> concreteNames = new HashSet<>();
         for (final Method m: concreteClass.getClass().getMethods()) {
             if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
@@ -21,7 +21,7 @@ public class TestInterfaces {
             }
         }
         final Set<String> interfaceNames = new HashSet<>();
-        for (final Method m: OIDCUserInfoProfileConfiguration.class.getMethods()) {
+        for (final Method m: OIDCAuthenticationRelyingPartyProfileConfiguration.class.getMethods()) {
             if (m.getName().startsWith("is") || m.getName().startsWith("get")) {
                 System.out.println("INT: "+m.getName());
                 interfaceNames.add(m.getName());
@@ -36,8 +36,7 @@ public class TestInterfaces {
                 interfaceNames.stream().filter(v -> !concreteNames.contains(v)).collect(Collectors.toList());
         
         inInterfaceNotClass.forEach(v -> System.out.println("Missing in class: "+v));
-        
-        
+
     }
 
 }

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