[java-idp-oidc] branch main updated: JOIDC-17 Repackaging into the net.shibboleth.* -namespace

Henri Mikkonen henri.mikkonen at iki.fi
Fri Feb 5 08:39:45 UTC 2021 

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

hjmikkon pushed a commit to branch main
in repository java-idp-oidc.

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

The following commit(s) were added to refs/heads/main by this push:
       new  11f848aa  JOIDC-17 Repackaging into the net.shibboleth.* -namespace
11f848aa is described below

commit 11f848aaf1e437c02a9c1187a2a74822d2aa2736
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Feb 5 10:37:32 2021 +0200

    JOIDC-17 Repackaging into the net.shibboleth.* -namespace
    
    https://issues.shibboleth.net/jira/browse/JOIDC-17
    
    Changed profile ids from http://csc.fi to http://shibboleth.net
    -based identifiers.
---
 NOTICE                                             | 24 ----------
 README.md                                          | 56 ----------------------
 .../op/config/OIDCCoreProtocolConfiguration.java   |  5 +-
 .../OIDCDynamicRegistrationConfiguration.java      |  2 +-
 .../OIDCProviderInformationConfiguration.java      |  2 +-
 .../op/config/OIDCPublishKeySetConfiguration.java  |  2 +-
 .../oidc/op/config/OIDCUserInfoConfiguration.java  |  2 +-
 .../OAuth2TokenIntrospectionConfiguration.java     |  2 +-
 .../config/OAuth2TokenRevocationConfiguration.java |  2 +-
 .../oauth2/introspection/introspection-beans.xml   |  2 +-
 .../flows/oauth2/revocation/revocation-beans.xml   |  3 +-
 .../idp/flows/oidc/authorize/authorize-beans.xml   |  3 +-
 .../idp/flows/oidc/discovery/discovery-beans.xml   |  3 +-
 .../idp/flows/oidc/keyset/keyset-beans.xml         |  3 +-
 .../idp/flows/oidc/register/register-beans.xml     |  3 +-
 .../idp/flows/oidc/token/token-beans.xml           |  3 +-
 .../idp/flows/oidc/userinfo/token-beans.xml        |  3 +-
 .../idp/flows/oidc/webfinger/webfinger-beans.xml   |  2 +-
 .../config/OIDCCoreProtocolConfigurationTest.java  |  2 +-
 19 files changed, 27 insertions(+), 97 deletions(-)

diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 9d728cf8..00000000
--- a/NOTICE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2017 - 2020, GÉANT
-
-Contributions to this work were made on behalf of the GÉANT project, a
-project that has received funding from the European Union’s Horizon 2020
-research and innovation programme under Grant Agreement No. 731122 (GN4-2)
-and Grant Agreement No. 856726 (GN4-3). On behalf of GÉANT project, GÉANT
-Association is the sole owner of the copyright in all material which was
-developed by a member of the GÉANT project. GÉANT Vereniging (Association)
-is registered with the Chamber of Commerce in Amsterdam with registration
-number 40535155 and operates in the UK as a branch of GÉANT Vereniging.
-Registered office: Hoekenrode 3, 1102BR Amsterdam, The Netherlands. UK
-branch address: City House, 126-130 Hills Road, Cambridge CB2 1PQ, UK.
-
-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.
diff --git a/README.md b/README.md
deleted file mode 100644
index adb5e7db..00000000
--- a/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# shibboleth-idp-oidc-extension
-
-[![Build Status](https://travis-ci.org/CSCfi/shibboleth-idp-oidc-extension.svg?branch=master)](https://travis-ci.org/CSCfi/shibboleth-idp-oidc-extension)
-
-The goal of the project is to provide a [OpenID Connect](http://openid.net/connect/) OP extension to [Shibboleth IdP V3](https://wiki.shibboleth.net/confluence/display/IDP30/Home). The work is done as part of task T3.1A OpenID Connect Federation in GN4-2 JRA3 project.
-
-
-The Shibboleth IdP 3.4 installed by this project is extended to act as a [OpenID Connect](http://openid.net/connect/) provider.  
-
-
-## Prerequisites
-- Java 7+
-- [Apache Maven 3](https://maven.apache.org/)
-- [Vagrant](https://www.vagrantup.com/)
-
-## Deployment
-The maven project needs to be built first. The ansible scipts will then perform first installation of Shibboleth Idp V3, after which the extensions are installed. 
-
-```
-git clone https://github.com/CSCfi/shibboleth-idp-oidc-extension
-cd shibboleth-idp-oidc-extension/
-mvn package
-vagrant up
-```
-
-## Playing around
-
-### Login
-You need to be root to access all the necessary files. 
-```
-vagrant ssh
-sudo su -
-```
-
-### View logs
-By following log entries it should be possible to get an idea of the execution.
-```
-tail -f /opt/shibboleth-idp/logs/idp-process.log
-``` 
-
-### Self Test Page
-Fastest way to test installation is to use preconfigured mod_auth_openidc client for authentication sequence that may be triggered on self test page [https://192.168.0.150](https://192.168.0.150)
-
-By modifying both the authentication request - /etc/httpd/conf.d/auth_openidc.conf - and the Shib OIDC OP extension configuration as described in Wiki you should be able to try different response types and claim sets just to name few.   
-
-### LDAP User to authenticate with
-The LDAP user is Ted Tester, in Finnish:
-
-```
-user:teppo
-password:testaaja
-```
-
-### Configuration
-See Wiki
-
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java
index d2915403..028be678 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfiguration.java
@@ -52,8 +52,11 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
 public class OIDCCoreProtocolConfiguration extends AbstractOIDCFlowAwareProfileConfiguration
         implements AuthenticationProfileConfiguration, OverriddenIssuerProfileConfiguration {
 
+    /** OIDC base protocol URI. */
+    @Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
+
     /** ID for this profile configuration. */
-    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oidc/sso/browser";
+    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/sso/browser";
 
     /** Whether attributes should be resolved in the course of the profile. */
     @Nonnull private Predicate<ProfileRequestContext> resolveAttributesPredicate;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java
index 9915b38f..f50065c5 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCDynamicRegistrationConfiguration.java
@@ -41,7 +41,7 @@ public class OIDCDynamicRegistrationConfiguration extends AbstractOIDCFlowAwareP
     public static final String PROTOCOL_URI = "https://openid.net/specs/openid-connect-registration-1_0.html";
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oidc/registration";
+    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/registration";
 
     /** Lookup function to override issuer value. */
     @Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java
index 86cf0f23..58af4966 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCProviderInformationConfiguration.java
@@ -41,7 +41,7 @@ public class OIDCProviderInformationConfiguration extends AbstractConditionalPro
     public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-discovery-1_0.html";
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oidc/configuration";
+    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/configuration";
 
     /** Lookup function to override issuer value. */
     @Nonnull private Function<ProfileRequestContext,String> issuerLookupStrategy;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java
index 7b0464d4..4b488b14 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCPublishKeySetConfiguration.java
@@ -34,7 +34,7 @@ public class OIDCPublishKeySetConfiguration extends AbstractConditionalProfileCo
             "https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata";
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oidc/keyset";
+    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/keyset";
 
     /**
      * Constructor.
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java
index 5839d64a..244941c6 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCUserInfoConfiguration.java
@@ -46,7 +46,7 @@ public class OIDCUserInfoConfiguration extends AbstractConditionalProfileConfigu
     @Nonnull @NotEmpty public static final String PROTOCOL_URI = "http://openid.net/specs/openid-connect-core-1_0.html";
 
     /** ID for this profile configuration. */
-    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oidc/userinfo";
+    @Nonnull @NotEmpty public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oidc/userinfo";
 
     /** Lookup function to supply attribute IDs to omit from UserInfo token. */
     @Nonnull private Function<ProfileRequestContext,Set<String>> deniedUserInfoAttributesLookupStrategy;
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
index 7fe9c2d4..2cb2d970 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenIntrospectionConfiguration.java
@@ -31,7 +31,7 @@ public class OAuth2TokenIntrospectionConfiguration extends AbstractOIDCClientAut
     public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7662";
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oauth2/introspection";
+    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/introspection";
 
     /**
      * Constructor.
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java
index af5a13bf..ac5ccc60 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/plugin/oidc/op/oauth2/config/OAuth2TokenRevocationConfiguration.java
@@ -32,7 +32,7 @@ public class OAuth2TokenRevocationConfiguration extends AbstractOIDCClientAuthen
     public static final String PROTOCOL_URI = "https://tools.ietf.org/html/rfc7009";
 
     /** ID for this profile configuration. */
-    public static final String PROFILE_ID = "http://csc.fi/ns/profiles/oauth2/revocation";
+    public static final String PROFILE_ID = "http://shibboleth.net/ns/profiles/oauth2/revocation";
 
     /**
      * Constructor.
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
index 7a6b3417..09b06771 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/introspection/introspection-beans.xml
@@ -8,7 +8,7 @@
     default-init-method="initialize" default-destroy-method="destroy">
 
     <bean id="shibboleth.oidc.profileId" class="java.lang.String"
-        c:_0="http://csc.fi/ns/profiles/oauth2/introspection" />
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenIntrospectionConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
index e8205df1..642b338b 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oauth2/revocation/revocation-beans.xml
@@ -7,7 +7,8 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oauth2/revocation" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.oauth2.config.OAuth2TokenRevocationConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
index a8cbacc1..94893496 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/authorize/authorize-beans.xml
@@ -8,7 +8,8 @@
     default-init-method="initialize" default-destroy-method="destroy">
 
     <bean id="shibboleth.oidc.browserProfile" class="java.lang.Boolean" c:_0="true" />
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/sso/browser" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCCoreProtocolConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
index b5697a31..bc6382ab 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/discovery/discovery-beans.xml
@@ -11,7 +11,8 @@
     <!-- Name of the publish flow for audit -->
     <bean id="OidcApiInfoFlowAuditName" class="java.lang.String" c:_0="Discovery" />
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/configuration" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCProviderInformationConfiguration).PROFILE_ID}" />
 
     <bean id="BuildErrorResponseFromEvent"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.BuildJSONErrorResponseFromEvent" scope="prototype"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
index 533d9969..248e9ace 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/keyset/keyset-beans.xml
@@ -10,7 +10,8 @@
     <!-- Name of the publish flow for audit -->
     <bean id="OidcApiInfoFlowAuditName" class="java.lang.String" c:_0="KeySet" />
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/keyset" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCPublishKeySetConfiguration).PROFILE_ID}" />
     
     <bean id="FormOutboundMessage"
         class="net.shibboleth.idp.plugin.oidc.op.profile.impl.FormOutboundKeySetResponseMessage" scope="prototype" />
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
index f77cd64c..057cb800 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/register/register-beans.xml
@@ -10,7 +10,8 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
     
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/registration" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCDynamicRegistrationConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage"
         class="org.opensaml.profile.action.impl.DecodeMessage"
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
index 04d9684e..04f47f88 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/token/token-beans.xml
@@ -7,7 +7,8 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/sso/browser" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCCoreProtocolConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
index 9eba9ceb..79e1cde7 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/userinfo/token-beans.xml
@@ -7,7 +7,8 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
     default-init-method="initialize" default-destroy-method="destroy">
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/userinfo" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String"
+        c:_0="#{T(net.shibboleth.idp.plugin.oidc.op.config.OIDCUserInfoConfiguration).PROFILE_ID}" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
index 306570ee..06fb0030 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/oidc/webfinger/webfinger-beans.xml
@@ -11,7 +11,7 @@
     <!-- Name of the publish flow for audit -->
     <bean id="FlowAuditName" class="java.lang.String" c:_0="Webfinger" />
 
-    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://csc.fi/ns/profiles/oidc/webfinger" />
+    <bean id="shibboleth.oidc.profileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/oidc/webfinger" />
     <bean id="shibboleth.oidc.browserProfile" class="java.lang.Boolean" c:_0="false" />
 
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage"
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java
index 49f5ce51..d3fd7c23 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/config/OIDCCoreProtocolConfigurationTest.java
@@ -45,7 +45,7 @@ public class OIDCCoreProtocolConfigurationTest {
 
     @Test
     public void testInitialState() throws ComponentInitializationException {
-        Assert.assertEquals(config.getId(), "http://csc.fi/ns/profiles/oidc/sso/browser");
+        Assert.assertEquals(config.getId(), OIDCCoreProtocolConfiguration.PROFILE_ID);
         Assert.assertTrue(config.getAuthenticationFlows(null).isEmpty());
         Assert.assertTrue(config.getPostAuthenticationFlows(null).isEmpty());
         Assert.assertTrue(config.getDefaultAuthenticationMethods(null).isEmpty());

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

More information about the commits mailing list