[java-oidc-common] branch main updated: JCOMOIDC-133 - Same PROFILE_ID constant value is defined by three interfaces
Henri Mikkonen
henri.mikkonen at iki.fi
Mon Jun 16 15:38:39 UTC 2025
This is an automated email from the git hooks/post-receive script.
hjmikkon 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=6c22b0e5049ae755628e7a26a62f4bb975cf71f0
The following commit(s) were added to refs/heads/main by this push:
new 6c22b0e JCOMOIDC-133 - Same PROFILE_ID constant value is defined by three interfaces
6c22b0e is described below
commit 6c22b0e5049ae755628e7a26a62f4bb975cf71f0
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Mon Jun 16 18:37:26 2025 +0300
JCOMOIDC-133 - Same PROFILE_ID constant value is defined by three interfaces
https://shibboleth.atlassian.net/browse/JCOMOIDC-133
- Removed the PROFILE_ID constant from OIDCAuthenticationProfileConfiguration and OIDCAuthenticationProfileConfiguration
- Removed the module IDs idp.oidc.common.4, idp.oidc.common.5 and idp.oidc.common.6
---
.../shibboleth/oidc/common/OIDCCommonModule4.java | 35 ----------------------
.../shibboleth/oidc/common/OIDCCommonModule5.java | 35 ----------------------
.../shibboleth/oidc/common/OIDCCommonModule6.java | 35 ----------------------
.../shibboleth/oidc/common/OIDCCommonPlugin.java | 7 ++---
.../services/net.shibboleth.idp.module.IdPModule | 3 --
.../net/shibboleth/oidc/common/module.properties | 21 -------------
.../OIDCAuthenticationProfileConfiguration.java | 4 ---
.../config/OIDCAuthorizationConfiguration.java | 5 ----
8 files changed, 2 insertions(+), 143 deletions(-)
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java
deleted file mode 100644
index a9b4cdf..0000000
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule4.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.oidc.common;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC Common module implementation.*/
-public class OIDCCommonModule4 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCCommonModule4() throws IOException, ModuleException {
- super(OIDCCommonModule4.class);
- }
-
-}
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java
deleted file mode 100644
index e6ba40b..0000000
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule5.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.oidc.common;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC Common module implementation.*/
-public class OIDCCommonModule5 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCCommonModule5() throws IOException, ModuleException {
- super(OIDCCommonModule5.class);
- }
-
-}
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java
deleted file mode 100644
index 6c57d11..0000000
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonModule6.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.oidc.common;
-
-import java.io.IOException;
-
-import net.shibboleth.idp.module.impl.PluginIdPModule;
-import net.shibboleth.profile.module.ModuleException;
-
-/** OIDC Common module implementation.*/
-public class OIDCCommonModule6 extends PluginIdPModule {
-
- /**
- * Constructor.
- *
- * @throws IOException if the property file cannot be loaded
- * @throws ModuleException if other errors occur
- */
- public OIDCCommonModule6() throws IOException, ModuleException {
- super(OIDCCommonModule6.class);
- }
-
-}
diff --git a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
index 06f96b3..06354bc 100644
--- a/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
+++ b/oidc-common-plugin/src/main/java/net/shibboleth/oidc/common/OIDCCommonPlugin.java
@@ -34,12 +34,9 @@ public class OIDCCommonPlugin extends FirstPartyIdPPlugin{
public OIDCCommonPlugin() throws IOException, PluginException{
super(OIDCCommonPlugin.class);
try {
- final IdPModule module4 = new OIDCCommonModule4();
- final IdPModule module5 = new OIDCCommonModule5();
- final IdPModule module6 = new OIDCCommonModule6();
final IdPModule module7 = new OIDCCommonModule7();
- setEnableOnInstall(CollectionSupport.setOf(module4, module5, module6, module7));
- setDisableOnRemoval(CollectionSupport.setOf(module4, module5, module6, module7));
+ setEnableOnInstall(CollectionSupport.setOf(module7));
+ setDisableOnRemoval(CollectionSupport.setOf(module7));
} catch (final IOException e) {
throw e;
} catch (final ModuleException e) {
diff --git a/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule b/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
index 8fba12f..d2d8409 100644
--- a/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
+++ b/oidc-common-plugin/src/main/resources/META-INF/services/net.shibboleth.idp.module.IdPModule
@@ -1,4 +1 @@
-net.shibboleth.oidc.common.OIDCCommonModule4
-net.shibboleth.oidc.common.OIDCCommonModule5
-net.shibboleth.oidc.common.OIDCCommonModule6
net.shibboleth.oidc.common.OIDCCommonModule7
diff --git a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
index 1eebbdd..079673d 100644
--- a/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
+++ b/oidc-common-plugin/src/main/resources/net/shibboleth/oidc/common/module.properties
@@ -1,30 +1,9 @@
# Properties defining this module.
# Class to Module ID mappings
-net.shibboleth.oidc.common.OIDCCommonModule4 = idp.oidc.common.4
-net.shibboleth.oidc.common.OIDCCommonModule5 = idp.oidc.common.5
-net.shibboleth.oidc.common.OIDCCommonModule6 = idp.oidc.common.6
net.shibboleth.oidc.common.OIDCCommonModule7 = idp.oidc.common.7
# Module Owner
-idp.oidc.common.4.plugin = net.shibboleth.oidc.common
-
-idp.oidc.common.4.name = OIDC Common Library
-idp.oidc.common.4.desc = Module that provides common OIDC processing functions for other plugins to use
-idp.oidc.common.4.url = /OIDCCommon
-
-idp.oidc.common.5.plugin = net.shibboleth.oidc.common
-
-idp.oidc.common.5.name = OIDC Common Library
-idp.oidc.common.5.desc = Module that provides common OIDC processing functions for other plugins to use
-idp.oidc.common.5.url = /OIDCCommon
-
-idp.oidc.common.6.plugin = net.shibboleth.oidc.common
-
-idp.oidc.common.6.name = OIDC Common Library
-idp.oidc.common.6.desc = Module that provides common OIDC processing functions for other plugins to use
-idp.oidc.common.6.url = /OIDCCommon
-
idp.oidc.common.7.plugin = net.shibboleth.oidc.common
idp.oidc.common.7.name = OIDC Common Library
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 8d4597d..824b4be 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
@@ -19,7 +19,6 @@ 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;
@@ -31,9 +30,6 @@ import net.shibboleth.shared.annotation.constraint.NotEmpty;
/** Generic configuration for an OIDC 1.0 authentication request.*/
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";
-
/**
* Should OpenID specific authentication request parameters should be passed in a single, self contained, JWT?
*
diff --git a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
index f505479..c5cfa5d 100644
--- a/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
+++ b/oidc-common-profile-api/src/main/java/net/shibboleth/oidc/profile/config/OIDCAuthorizationConfiguration.java
@@ -26,7 +26,6 @@ import net.shibboleth.oidc.profile.oauth2.config.OAuth2AuthorizationCodeProducin
import net.shibboleth.profile.config.OverriddenIssuerProfileConfiguration;
import net.shibboleth.shared.annotation.ConfigurationSetting;
import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
import net.shibboleth.shared.annotation.constraint.NotLive;
/**
@@ -34,14 +33,10 @@ import net.shibboleth.shared.annotation.constraint.NotLive;
*
* <p>This is specific to the role of the OpenID Provider (OP).</p>
*/
-//TODO: Change name of this interface in v3?
public interface OIDCAuthorizationConfiguration extends OIDCAuthenticationProfileConfiguration,
OAuth2AuthorizationCodeProducingProfileConfiguration, AuthenticationProfileConfiguration,
OverriddenIssuerProfileConfiguration, OIDCSSOProviderConfiguration {
- /** ID for this profile configuration. */
- @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";
-
/** Bit constant for essential ACR request feature. */
static final int FEATURE_ESSENTIAL_ACR_REQUEST= 0x1;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list