[java-idp-plugin-oidc-rp] branch main updated: Improve packaging. Fix Javadoc.

Phil Smart philip.smart at jisc.ac.uk
Fri Oct 14 15:47:16 UTC 2022


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

philsmart pushed a commit to branch main
in repository java-idp-plugin-oidc-rp.

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

The following commit(s) were added to refs/heads/main by this push:
     new f2dd4c0  Improve packaging. Fix Javadoc.
f2dd4c0 is described below

commit f2dd4c0c0999a2ed6cb75b925964fb41cc87d68d
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Oct 14 16:47:09 2022 +0100

    Improve packaging. Fix Javadoc.
---
 .../authn/oidc/rp/context/OAuth2ClientContext.java |   1 +
 .../oidc/rp/context/UserInfoResponseContext.java   |   2 +-
 .../rp/impl/PrepareOIDCInboundMessageContext.java  |   2 +-
 .../META-INF/net.shibboleth.idp/postconfig.xml     |   2 +-
 .../oidc-relying-party-authn-flow.xml              |   2 +-
 .../idp/service/attribute/registry/postconfig.xml  | 411 +--------------------
 .../idp/service/relying-party/postconfig.xml       | 271 ++++++++++++++
 .../authn/oidc/rp/conf/authn}/oidc-claim-rules.xml |   0
 .../oidc/rp/conf/authn/oidc-rp-credentials.xml     |   1 -
 .../authn/oidc/rp/conf/authn/oidc-rp.properties    |  10 +-
 .../idp/plugin/authn/oidc/rp/module.properties     |  27 +-
 pom.xml                                            |   2 +-
 12 files changed, 305 insertions(+), 426 deletions(-)

diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/OAuth2ClientContext.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/OAuth2ClientContext.java
index ca8cdfd..ed8c048 100644
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/OAuth2ClientContext.java
+++ b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/OAuth2ClientContext.java
@@ -37,6 +37,7 @@ import net.shibboleth.utilities.java.support.logic.Constraint;
  * @parent {@link OIDCPeerEntityContext}
  * @added During an OAuth 2.0 authentication request attempt
  */
+//TODO do we need this, we could just take stuff off the RP profile config
 public class OAuth2ClientContext extends BaseContext {
     
     /** The client_id.*/
diff --git a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/UserInfoResponseContext.java b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/UserInfoResponseContext.java
index 3ad71c8..8d4fa34 100644
--- a/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/UserInfoResponseContext.java
+++ b/idp-oidc-rp-api/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/context/UserInfoResponseContext.java
@@ -24,7 +24,7 @@ import org.opensaml.messaging.context.BaseContext;
 import net.shibboleth.idp.plugin.authn.oidc.rp.messaging.UserInfoResponse;
 
 
-/** A context to hold the response from a UserInfo endpoint.*/
+/** A context to hold the response from the UserInfo endpoint.*/
 public class UserInfoResponseContext  extends BaseContext {
     
     /** The UserInfo response.*/
diff --git a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
index 509273a..14da715 100644
--- a/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
+++ b/idp-oidc-rp-impl/src/main/java/net/shibboleth/idp/plugin/authn/oidc/rp/impl/PrepareOIDCInboundMessageContext.java
@@ -56,7 +56,7 @@ public class PrepareOIDCInboundMessageContext extends AbstractProfileAction {
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(PrepareOIDCInboundMessageContext.class);
     
-    /** Strategy to lookup the identifier of the OP/RP to based the inbound context on. */
+    /** Strategy to lookup the identifier of the OP/RP to base the inbound context on. */
     @NonnullAfterInit private Function<ProfileRequestContext,String> identifierLookupStrategy;
     
     /** The identifier of the OP/RP to base the inbound context on. */
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
index 6f964c0..9d5c548 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net.shibboleth.idp/postconfig.xml
@@ -180,7 +180,7 @@
     </bean>
 
     <!-- location of the OIDC servlet authorization endpoint relative to the servlet -->
-    <bean id="shibboleth.authn.OIDC.externalAuthnPath" class="java.lang.String"
+    <bean id="shibboleth.authn.oidc.rp.externalAuthnPath" class="java.lang.String"
         c:_0="servletRelative:#{getObject('shibboleth.authn.OIDC.externalServletPath')}#{T(net.shibboleth.idp.plugin.authn.oidc.rp.impl.AuthorizationController).AUTHORIZE_PATH_SEGMENT}" />
 
     <bean id="shibboleth.authn.oidc.rp.AuthorizationController"
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
index 41e626a..b0d551a 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/OIDCRelyingParty/oidc-relying-party-authn-flow.xml
@@ -66,7 +66,7 @@
     </action-state>
 
     <view-state id="AuthnRequest"
-        view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.OIDC.externalAuthnPath'), flowExecutionContext.getKey().toString())}">
+        view="externalRedirect:#{T(net.shibboleth.idp.authn.ExternalAuthentication).getExternalRedirect(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.authn.oidc.rp.externalAuthnPath'), flowExecutionContext.getKey().toString())}">
         <attribute name="csrf_excluded" value="true" type="boolean" />
         <on-render>
             <evaluate
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
index 55000a8..0409f2f 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/postconfig.xml
@@ -22,415 +22,6 @@
     <bean id="OIDCScopedStringTranscoder"
         class="net.shibboleth.oidc.attribute.transcoding.impl.OIDCScopedStringAttributeTranscoder" />
         
-    <bean parent="shibboleth.TranscodingRuleLoader">
-    <constructor-arg>
-    <list>
-
-        <!-- Typical inetOrgPerson attributes that map to standard claims. -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">displayName</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">name</prop>
-                    <prop key="displayName.en">Display name</prop>
-                    <prop key="displayName.de">Anzeigename</prop>
-                    <prop key="displayName.fr">Nom</prop>
-                    <prop key="displayName.it">Nome</prop>
-                    <prop key="displayName.ja">表示名</prop>
-                    <prop key="description.en">The name that should appear in white-pages-like applications for this person.</prop>
-                    <prop key="description.de">Anzeigename</prop>
-                    <prop key="description.fr">Nom complet d'affichage</prop>
-                    <prop key="description.it">Nome</prop>
-                    <prop key="description.ja">アプリケーションでの表示に用いられる英字氏名</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">givenName</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">given_name</prop>
-                    <prop key="displayName.en">Given name</prop>
-                    <prop key="displayName.de">Vorname</prop>
-                    <prop key="displayName.fr">Prénom</prop>
-                    <prop key="displayName.it">Nome</prop>
-                    <prop key="displayName.ja">名</prop>
-                    <prop key="description.en">Given name of a person</prop>
-                    <prop key="description.de">Vorname</prop>
-                    <prop key="description.fr">Prénom de l'utilisateur</prop>
-                    <prop key="description.it">Nome</prop>
-                    <prop key="description.ja">氏名(名)の英語表記</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">homePhone</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">phone_number</prop>
-                    <prop key="displayName.en">Private phone number</prop>
-                    <prop key="displayName.de">Telefon Privat</prop>
-                    <prop key="displayName.fr">Teléphone personnel</prop>
-                    <prop key="displayName.it">Numero di telefono privato</prop>
-                    <prop key="displayName.ja">自宅電話番号</prop>
-                    <prop key="description.en">Private phone number</prop>
-                    <prop key="description.de">Private Telefonnummer</prop>
-                    <prop key="description.fr">Numéro de téléphone de domicile de la personne</prop>
-                    <prop key="description.it">Numero di telefono privato</prop>
-                    <prop key="description.ja">自宅の電話番号</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">mail</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">email</prop>
-                    <prop key="displayName.en">E-mail</prop>
-                    <prop key="displayName.de">E-Mail</prop>
-                    <prop key="displayName.fr">Email</prop>
-                    <prop key="displayName.it">E-mail</prop>
-                    <prop key="displayName.ja">メールアドレス</prop>
-                    <prop key="description.en">E-Mail: Preferred address for e-mail to be sent to this person</prop>
-                    <prop key="description.de">E-Mail-Adresse</prop>
-                    <prop key="description.de-ch">E-Mail Adresse</prop>
-                    <prop key="description.fr">Adresse de courrier électronique</prop>
-                    <prop key="description.it">E-Mail: l'indirizzo e-mail preferito dall'utente</prop>
-                    <prop key="description.ja">メールアドレス</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">preferredLanguage</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">locale</prop>
-                    <prop key="displayName.en">Preferred Language</prop>
-                    <prop key="displayName.de">Bevorzugte Sprache</prop>
-                    <prop key="displayName.fr">Langue préférée</prop>
-                    <prop key="displayName.it">Lingua preferita</prop>
-                    <prop key="displayName.ja">希望言語</prop>
-                    <prop key="description.en">Preferred language: Users preferred language (see RFC1766)</prop>
-                    <prop key="description.de">Bevorzugte Sprache (siehe RFC1766)</prop>
-                    <prop key="description.fr">Exemple: fr, de, it, en, ... (voir RFC1766)</prop>
-                    <prop key="description.it">Lingua preferita: la lingua preferita dall'utente (cfr. RFC1766)</prop>
-                    <prop key="description.ja">利用者が希望する言語(RFC1766 を参照)</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">sn</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">family_name</prop>
-                    <prop key="displayName.en">Surname</prop>
-                    <prop key="displayName.de">Nachname</prop>
-                    <prop key="displayName.fr">Nom de famille</prop>
-                    <prop key="displayName.it">Cognome</prop>
-                    <prop key="displayName.ja">姓</prop>
-                    <prop key="description.en">Surname or family name</prop>
-                    <prop key="description.de">Familienname</prop>
-                    <prop key="description.fr">Nom de famille de l'utilisateur.</prop>
-                    <prop key="description.it">Cognome dell'utilizzatore</prop>
-                    <prop key="description.ja">氏名(姓)の英語表記</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">telephoneNumber</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">phone_number</prop>
-                    <prop key="displayName.en">Business phone number</prop>
-                    <prop key="displayName.de">Telefon Geschäft</prop>
-                    <prop key="displayName.fr">Teléphone professionnel</prop>
-                    <prop key="displayName.it">Numero di telefono dell'ufficio</prop>
-                    <prop key="displayName.ja">所属機関内電話番号</prop>
-                    <prop key="description.en">Business phone number: Office or campus phone number</prop>
-                    <prop key="description.de">Telefonnummer am Arbeitsplatz</prop>
-                    <prop key="description.fr">Teléphone de l'institut, de l'université</prop>
-                    <prop key="description.it">Numero di telefono dell'ufficio</prop>
-                    <prop key="description.ja">所属機関での利用者の電話番号</prop>
-                </props>
-            </property>
-        </bean>
-        
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">uid</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">preferred_username</prop>
-                    <prop key="displayName.en">User ID</prop>
-                    <prop key="displayName.de">Benutzer-ID</prop>
-                    <prop key="displayName.fr">ID utilisateur</prop>
-                    <prop key="displayName.it">ID dell'utente</prop>
-                    <prop key="displayName.ja">ユーザID</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly used for user identification within the user's home organization.</prop>
-                    <prop key="description.de">Eine eindeutige Nummer für eine Person, welche hauptsächlich zur Identifikation innerhalb der Organisation benutzt wird.</prop>
-                    <prop key="description.fr">Identifiant de connexion d'une personnes sur les systèmes informatiques.</prop>
-                    <prop key="description.it">Identificativo unico della persona, usato per l'identificazione dell'utente all'interno della organizzazione di appartenenza.</prop>
-                    <prop key="description.ja">所属機関内で一意の利用者識別子</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- eduPerson attributes that map to standard claims. -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonNickname</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">nickname</prop>
-                    <prop key="displayName.en">Nickname</prop>
-                    <prop key="displayName.de">Kurzname</prop>
-                    <prop key="displayName.de-ch">Übername</prop>
-                    <prop key="displayName.fr">Surnom</prop>
-                    <prop key="displayName.it">Diminutivo</prop>
-                    <prop key="displayName.ja">ニックネーム</prop>
-                    <prop key="description.en">Person's nickname, or the informal name by which they are accustomed to be hailed.</prop>
-                    <prop key="description.de">Kurzname einer Person, oder üblicher Rufname zur Begrüßung.</prop>
-                    <prop key="description.de-ch">Übername einer Person, oder üblicher Rufname zur Begrüssung.</prop>
-                    <prop key="description.fr">Nom personnalisable pour un usage informel.</prop>
-                    <prop key="description.it">Diminutivo della persona, o  soprannome.</prop>
-                    <prop key="description.ja">利用者のニックネームもしくは通称</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- A subset of the major eduPerson attributes that have no standard claim mapping. -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonAssurance</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">eduPersonAssurance</prop>
-                    <prop key="displayName.en">Assurance level</prop>
-                    <prop key="displayName.de">Vertrauensgrad</prop>
-                    <prop key="displayName.fr">Niveau de confiance</prop>
-                    <prop key="displayName.it">Livello di sicurezza</prop>
-                    <prop key="displayName.ja">保証レベル</prop>
-                    <prop key="description.en">Set of URIs that assert compliance with specific standards for identity assurance.</prop>
-                    <prop key="description.de">URIs die eine gewisse Zusicherung für spezifische Standards des Vertrauens beinhalten</prop>
-                    <prop key="description.fr">Un ensemble d'URI qui attestent la conformité selon un standard pour les niveaux d'assurance d'identités</prop>
-                    <prop key="description.it">Un insieme di URI che asseriscono l'osservanza dei livelli di sicurezza richiesti</prop>
-                    <prop key="description.ja">IDの保証レベルに関して特定の基準に準拠していることを示すURI</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonEntitlement</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">eduPersonEntitlement</prop>
-                    <prop key="displayName.en">Entitlement</prop>
-                    <prop key="displayName.de">Berechtigung</prop>
-                    <prop key="displayName.fr">Entitlement</prop>
-                    <prop key="displayName.it">Prerogativa</prop>
-                    <prop key="displayName.ja">資格情報</prop>
-                    <prop key="description.en">Member of: URI (either URL or URN) that indicates a set of rights to specific resources based on an agreement across the releavant community</prop>
-                    <prop key="description.de">Zeichenkette, die Rechte für spezifische Ressourcen beschreibt</prop>
-                    <prop key="description.fr">Membre de: URI (soit une URL ou une URN) décrivant un droit spécific d'accès.</prop>
-                    <prop key="description.it">Membro delle seguenti URI (sia URL o URN) che rappresentano diritti specifici d'accesso validi in tutta la communità</prop>
-                    <prop key="description.ja">特定のアプリケーションもしくはコミュニティ内の複数リソースへのアクセス権限を持つことを示すURI(URLもしくはURN)</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonPrincipalName</prop>
-                    <prop key="transcoder">OIDCScopedStringTranscoder</prop>
-                    <prop key="oidc.name">eduPersonPrincipalName</prop>
-                    <prop key="displayName.en">Principal name</prop>
-                    <prop key="displayName.de">Persönliche ID</prop>
-                    <prop key="displayName.fr">Principal Name</prop>
-                    <prop key="displayName.it">Principal Name</prop>
-                    <prop key="displayName.ja">プリンシパルID</prop>
-                    <prop key="description.en">A unique identifier for a person, mainly for inter-institutional user identification.</prop>
-                    <prop key="description.de">Eindeutige Benutzeridentifikation</prop>
-                    <prop key="description.de-ch">Eindeutige Benützeridentifikation</prop>
-                    <prop key="description.fr">L'identifiant unique de l'utilisateur</prop>
-                    <prop key="description.it">Un ID personale che identifica chiaramente l'utente in seno alla sua organizzazione</prop>
-                    <prop key="description.ja">フェデレーション内で一意かつ永続的な利用者識別子</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">eduPersonScopedAffiliation</prop>
-                    <prop key="transcoder">OIDCScopedStringTranscoder</prop>
-                    <prop key="oidc.name">eduPersonScopedAffiliation</prop>
-                    <prop key="displayName.en">Scoped affiliation</prop>
-                    <prop key="displayName.de">Zugehörigkeit</prop>
-                    <prop key="displayName.fr">Affiliation</prop>
-                    <prop key="displayName.it">Tipo di membro</prop>
-                    <prop key="displayName.ja">スコープ付き職位</prop>
-                    <prop key="description.en">Specifies the person's affiliation within a particular security domain</prop>
-                    <prop key="description.de">Art der Zugehörigkeit zur Heimatorganisation</prop>
-                    <prop key="description.de-ch">Art der Zugehörigkeit zur Heimorganisation</prop>
-                    <prop key="description.fr">Type d'affiliation dans l'organisation</prop>
-                    <prop key="description.it">Tipo di membro: Tipo di lavoro svolto per l'organizzazione</prop>
-                    <prop key="description.ja">セキュリティドメインのスコープが付いた所属機関における職位</prop>
-                </props>
-            </property>
-        </bean>
-
-        <!-- The remainder are standard OIDC claims, which we map based on the actual claim name. -->
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">address</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.asObject">true</prop>
-                    <prop key="oidc.name">address</prop>
-                    <prop key="displayName.en">Postal address</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">birthdate</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">birthdate</prop>
-                    <prop key="displayName.en">Date of birth</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">email_verified</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">email_verified</prop>
-                    <prop key="oidc.asBoolean">true</prop>
-                    <prop key="displayName.en">E-mail verification status</prop>
-                    <prop key="description.en">Indicates whether e-mail address has been verified by the issuer</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">gender</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">gender</prop>
-                    <prop key="displayName.en">Gender</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">middle_name</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">middle_name</prop>
-                    <prop key="displayName.en">Middle name</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">phone_number_verified</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">phone_number_verified</prop>
-                    <prop key="oidc.asBoolean">true</prop>
-                    <prop key="displayName.en">Phone number verification status</prop>
-                    <prop key="description.en">Indicates whether phone number has been verified by the issuer</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">picture</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">picture</prop>
-                    <prop key="displayName.en">Picture</prop>
-                    <prop key="description.en">URL of personal photo</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">profile</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">profile</prop>
-                    <prop key="displayName.en">Profile page</prop>
-                    <prop key="description.en">URL of personal profile page</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">website</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">website</prop>
-                    <prop key="displayName.en">Web site</prop>
-                    <prop key="description.en">URL to personal web site</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">updated_at</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">updated_at</prop>
-                    <prop key="oidc.asInteger">true</prop>
-                    <prop key="displayName.en">Last update of information</prop>
-                </props>
-            </property>
-        </bean>
-
-        <bean parent="shibboleth.TranscodingProperties">
-            <property name="properties">
-                <props merge="true">
-                    <prop key="id">zoneinfo</prop>
-                    <prop key="transcoder">OIDCStringTranscoder</prop>
-                    <prop key="oidc.name">zoneinfo</prop>
-                    <prop key="displayName.en">Time zone</prop>
-                </props>
-            </property>
-        </bean>
-
-    </list>
-    </constructor-arg>
-    </bean>
+  
     
 </beans>
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index 0f078cc..6e4dc3b 100644
--- a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -11,5 +11,276 @@
 
 
     <!-- This was all moved to commons -->
+    
+    <!-- TODO I moved this back for the time being -->
+    
+    
+    <bean id="AbstractOIDCProfile" abstract="true"
+        p:securityConfiguration-ref="%{idp.security.authn.oidc.rp.config:shibboleth.authn.oidc.rp.DefaultSecurityConfiguration}" />
+
+    <bean id="AbstractOIDCSSOProfile" parent="AbstractOIDCProfile" abstract="true" 
+        p:issuer-ref="issuer"
+        p:tokenEndpointAuthMethods="%{idp.authn.oidc.rp.tokenEndpointAuthMethods:client_secret_basic,client_secret_post,client_secret_jwt,private_key_jwt}"/>
+
+   <bean id="OIDC.SSO" parent="AbstractOIDCSSOProfile" lazy-init="true"
+        class="net.shibboleth.oidc.profile.config.OIDCAuthorizationConfiguration"
+        p:httpRequestMethod="%{idp.authn.oidc.rp.httpRequestMethod:GET}"
+        p:clientId="#{%{idp.authn.oidc.rp.provider.discoveryRequired:false} == true ? null : '%{idp.authn.oidc.rp.client.clientId:}'}"
+        p:clientCredential="#{%{idp.authn.oidc.rp.provider.discoveryRequired:false} == true ? {null} : getObject('shibboleth.authn.oidc.rp.DefaultCredential')}"
+        p:tokenEndpointAuthMethods="%{idp.authn.oidc.rp.client.authenticationMethod:client_secret_basic}"
+        p:responseMode="%{idp.authn.oidc.rp.client.responseMode:#{null}}"
+        p:retrieveUserInfoEndpointClaims="%{idp.authn.oidc.rp.client.userinfo.enabled:true}"
+        p:redirectUriOverride="%{idp.authn.oidc.rp.client.redirectURI:#{null}}"
+        p:encryptRequestObject="%{idp.authn.oidc.rp.client.requestobject.encrypted:false}"
+        p:signRequestObject="%{idp.authn.oidc.rp.client.requestobject.signed:true}"
+        p:useRequestObject="%{idp.authn.oidc.rp.client.requestobject.supported:false}"
+        p:scopes="%{idp.authn.oidc.rp.client.scopes:#{null}}">
+        <property name="forceAuthnPredicate">
+            <bean class="net.shibboleth.idp.saml.profile.config.logic.ProxyAwareForceAuthnPredicate" />
+        </property>
+        <property name="defaultAuthenticationMethodsLookupStrategy">
+            <bean
+                class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.ProxyAwareDefaultOIDCAuthenticationContextClassRequestLookupFunction"
+                p:mappings="#{getObject('shibboleth.authn.oidc.rp.PrincipalProxyRequestMappings')}" />
+        </property>
+         <property name="authenticationContextClassReferenceTranslationStrategyLookupStrategy">
+            <bean
+                class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.ProxyAwareDefaultOIDCAuthenticationContextClassResponseLookupFunction$LookupFunctionWrapper">
+                <constructor-arg>
+                    <bean class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.ProxyAwareDefaultOIDCAuthenticationContextClassResponseLookupFunction"
+                    c:mappings="#{getObject('shibboleth.authn.oidc.rp.PrincipalProxyResponseMappings')}"/>
+                </constructor-arg>
+            </bean>
+        </property>
+         <property name="authenticationMethodsReferencesTranslationStrategyLookupStrategy">
+            <bean
+                class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.ProxyAwareDefaultOIDCAuthenticationContextClassResponseLookupFunction$LookupFunctionWrapper">
+                <constructor-arg>
+                    <bean class="net.shibboleth.idp.plugin.authn.oidc.rp.config.navigate.ProxyAwareDefaultOIDCAuthenticationContextClassResponseLookupFunction"
+                    c:mappings="#{getObject('shibboleth.authn.oidc.rp.PrincipalProxyResponseMappings')}"/>
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+    
+     <!-- 
+        Security Configuration Defaults. These settings establish the default security configurations for 
+        signatures and loads the default credentials used. 
+    --> 
+   <bean id="shibboleth.authn.oidc.rp.BasicSignatureValidationConfiguration" abstract="true"
+        class="net.shibboleth.oidc.security.impl.BasicJWTSignatureValidationConfiguration"
+        p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedSignatureAlgorithms')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedSignatureAlgorithms')}" />
+    
+    <bean id="shibboleth.authn.oidc.rp.BasicSignatureSigningConfiguration" abstract="true"
+        class="net.shibboleth.oidc.security.impl.BasicJWTSignatureSigningConfiguration"
+        p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedSignatureAlgorithms')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedSignatureAlgorithms')}" />
+    
+    <bean id="shibboleth.authn.oidc.rp.BasicEncryptionConfiguration" abstract="true"
+        class="net.shibboleth.oidc.security.impl.BasicJWTEncryptionConfiguration"
+        p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedEncryptionAlgorithms')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedEncryptionAlgorithms')}" />
+
+    <bean id="shibboleth.authn.oidc.rp.BasicDecryptionConfiguration" abstract="true"
+        class="net.shibboleth.oidc.security.impl.BasicJWTDecryptionConfiguration"
+        p:includedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.IncludedEncryptionAlgorithms')}"
+        p:excludedAlgorithms="#{getObject('shibboleth.authn.oidc.rp.ExcludedEncryptionAlgorithms')}" />
+   
+
+    <bean id="shibboleth.authn.oidc.rp.DefaultSecurityConfiguration"
+        class="net.shibboleth.oidc.profile.config.OIDCSecurityConfiguration">
+        <property name="jwtDecryptionConfiguration">
+            <ref
+                bean="#{'%{idp.authn.oidc.rp.idtoken.decrypt.config:shibboleth.authn.oidc.rp.DefaultJWTDecryptionConfiguration}'.trim()}" />
+        </property>
+        <property name="jwtSignatureValidationConfiguration">
+            <ref
+                bean="#{'%{idp.authn.oidc.rp.idtoken.valid.config:shibboleth.authn.oidc.rp.DefaultJWTSignatureValidationConfiguration}'.trim()}" />
+        </property>       
+        <property name="jwtSignatureSigningConfiguration">
+            <ref
+                bean="#{'%{idp.authn.oidc.rp.requestobject.signing.config:shibboleth.authn.oidc.rp.DefaultJWTSigningConfiguration}'.trim()}" />
+        </property>
+        <property name="jwtEncryptionConfiguration">
+            <ref
+                bean="#{'%{idp.authn.oidc.rp.requestobject.encryption.config:shibboleth.authn.oidc.rp.DefaultJWTEncryptionConfiguration}'.trim()}" />
+        </property>
+    </bean>
+
+    <!-- 
+        See https://openid.net/specs/openid-connect-core-1_0.html#Encryption. But encryption is either based
+        on published OP keys, or the client_secret, so we can not allow abitrarily configured keys 
+    -->
+    <bean id="shibboleth.authn.oidc.rp.DefaultJWTEncryptionConfiguration" 
+        parent="shibboleth.authn.oidc.rp.BasicEncryptionConfiguration"
+        p:KEKCredentialResolver-ref="defaultOIDCRPKeyEncryptionCredentialResolver"
+        p:contentEncryptionKeyCredentialResolver-ref="defaultOIDCRPContentEncryptionKeyCredentialResolver">
+        <property name="keyTransportEncryptionAlgorithms">
+            <list>              
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_1_5" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_RSA_OAEP_256" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_128_GCM_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_192_GCM_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_AES_256_GCM_KW" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.KeyManagementConstants.ALGO_ID_ALG_ECDH_ES" />                
+            </list>
+        </property>
+        <property name="dataEncryptionAlgorithms">
+            <list> 
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128GCM" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192GCM" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256GCM" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A128CBC_HS256" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A192CBC_HS384" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.EncryptionConstants.ALGO_ID_ENC_ALG_A256CBC_HS512" />
+            </list>
+        </property>
+    </bean>
+
+    <bean id="shibboleth.authn.oidc.rp.DefaultJWTSigningConfiguration"
+        parent="shibboleth.authn.oidc.rp.BasicSignatureSigningConfiguration"
+        p:signingCredentials-ref="shibboleth.authn.oidc.rp.SigningCredentials">
+        <property name="signatureAlgorithms">
+            <list>
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_256" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_384" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_RS_512" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_256" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_384" />
+                <util:constant
+                    static-field="net.shibboleth.oidc.jwa.support.SignatureConstants.ALGO_ID_SIGNATURE_HS_512" />
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="shibboleth.authn.oidc.rp.DefaultJWTDecryptionConfiguration"
+        parent="shibboleth.authn.oidc.rp.BasicDecryptionConfiguration"
+        p:KEKCredentialResolver-ref="defaultOIDCRPKeyDecryptionCredentialResolver"
+        p:contentEncryptionKeyCredentialResolver-ref="defaultOIDCRPContentDecryptionKeyCredentialResolver" />
+        
+        
+    <bean id="shibboleth.authn.oidc.rp.SigningCredentials"
+        class="net.shibboleth.idp.plugin.authn.oidc.rp.config.CredentialsListFactory"
+        c:_0="#{getObject('shibboleth.authn.oidc.rp.DefaultSigningCredentials')}" />
+        
+
+    <!-- 
+        A resolver to public/private key encryption keys global to the RP 
+    -->
+    <bean id="defaultOIDCRPKeyDecryptionCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
+        <constructor-arg>
+            <list>
+                <bean class="net.shibboleth.oidc.security.credential.impl.LocalJOSEObjectCredentialResolver">
+                    <constructor-arg name="localCredentialResolver">
+                        <bean
+                            class="net.shibboleth.oidc.security.credential.impl.CollectionJOSEObjectCredentialResolver"
+                            c:credentials-ref="shibboleth.authn.oidc.rp.DefaultKeyEncryptionCredentials" />
+                    </constructor-arg>
+                </bean>
+                <bean id="CriterionCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver" />
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <!-- 
+        A resolver to resolve a pre-shared Direct Encryption key e.g. a pairwise client_secret from the input criterion
+        from which to derive the decryption key. 
+    -->
+    <bean id="defaultOIDCRPContentDecryptionKeyCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
+        <constructor-arg>
+            <list>
+                <bean id="CriterionCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver" />
+            </list>
+        </constructor-arg>
+    </bean>
+    
+    <!-- A resolver to public key encryption in the OPs metadata alongside the client_secret for key wrapping -->
+    <bean id="defaultOIDCRPKeyEncryptionCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
+        <constructor-arg>
+            <list>
+                <bean id="OIDCProviderMetadataCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.ProviderMetadataCredentialResolver"
+                    p:remoteJwkSetCache-ref="shibboleth.authn.oidc.rp.RemoteJwkSetCache"
+                    p:keyFetchInterval="%{idp.authn.oidc.rp.provider.keyfetch.interval:PT30M}" />
+                <bean id="CriterionCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver" />
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <!-- 
+        A resolver to resolve pre-shared Direct Encryption or Key Wrapping credentials based on the
+        client_secret in the input criterion. Returns the raw value, even though the key to use
+        is a derivative of this key.
+    -->
+    <bean id="defaultOIDCRPContentEncryptionKeyCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
+        <constructor-arg>
+            <list>
+                <bean id="CriterionCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver" />
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <bean id="shibboleth.authn.oidc.rp.DefaultJWTSignatureValidationConfiguration"
+        parent="shibboleth.authn.oidc.rp.BasicSignatureValidationConfiguration"
+        p:signatureTrustEngine-ref="ExplicitKeySignedJWTTrustEngine">
+    </bean>
+
+    <!-- A resolver for resolving trusted credentials to match against those resolved from the JWT -->
+    <bean id="defaultSignedJWTTrustedCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.ChainingJOSEObjectCredentialResolver">
+        <constructor-arg>
+            <list>
+                <bean id="OIDCProviderMetadataCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.ProviderMetadataCredentialResolver"
+                    p:remoteJwkSetCache-ref="shibboleth.authn.oidc.rp.RemoteJwkSetCache" 
+                    p:keyFetchInterval="%{idp.authn.oidc.rp.provider.keyfetch.interval:PT30M}"/>
+                <bean id="CriterionCredentialResolver"
+                    class="net.shibboleth.oidc.security.credential.impl.CriterionCredentialResolver" />
+            </list>
+        </constructor-arg>
+    </bean>
+
+    <!-- A resolver for resolving 'untrusted' credentials out of the JOSE header of JWTs -->
+    <bean id="defaultSignedJWTJOSEHeaderCredentialResolver"
+        class="net.shibboleth.oidc.security.credential.impl.BasicJOSEObjectCredentialResolver" />
+
+    <bean id="ExplicitKeySignedJWTTrustEngine"
+        class="net.shibboleth.oidc.security.impl.ExplicitKeySignedJWTTrustEngine"
+        c:resolver-ref="defaultSignedJWTTrustedCredentialResolver"
+        c:JOSEObjectResolver-ref="defaultSignedJWTJOSEHeaderCredentialResolver" />
 
 </beans>
diff --git a/idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/oidc-claim-rules.xml b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-claim-rules.xml
similarity index 100%
rename from idp-oidc-rp-impl/src/main/resources/META-INF/net/shibboleth/idp/service/attribute/registry/oidc-claim-rules.xml
rename to idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-claim-rules.xml
diff --git a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-credentials.xml b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-credentials.xml
index 724dbc8..f3829ff 100644
--- a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-credentials.xml
+++ b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-credentials.xml
@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
diff --git a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp.properties b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp.properties
index f2bd3e9..6d92cd6 100644
--- a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp.properties
+++ b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp.properties
@@ -12,14 +12,14 @@ idp.authn.oidc.rp.client.redirecturl.allowedOrigins = https://localhost:8443
 #idp.authn.oidc.rp.provider.discoveryRequired=false
 #idp.authn.discoveryURL=http://opdisco.com
 
-idp.authn.oidc.rp.client.requestobject.supported= false
-idp.authn.oidc.rp.client.requestobject.encrypted = false
-idp.authn.oidc.rp.client.requestobject.signed = true
+#idp.authn.oidc.rp.client.requestobject.supported= false
+#idp.authn.oidc.rp.client.requestobject.encrypted = false
+#idp.authn.oidc.rp.client.requestobject.signed = true
 
-idp.authn.oidc.rp.client.userinfo.enabled = true
+#idp.authn.oidc.rp.client.userinfo.enabled = true
 
 ## Use small fetch interval so we can re-run tests against the certification OP
-idp.authn.oidc.rp.provider.keyfetch.interval = PT5S
+#idp.authn.oidc.rp.provider.keyfetch.interval = PT30M
 
 ## Override the default response_mode for the given response_type
 #idp.authn.oidc.rp.client.responseMode = query
diff --git a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/module.properties b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/module.properties
index 0830f88..adb7f3f 100644
--- a/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/module.properties
+++ b/idp-oidc-rp-impl/src/main/resources/net/shibboleth/idp/plugin/authn/oidc/rp/module.properties
@@ -6,9 +6,26 @@ net.shibboleth.idp.plugin.authn.oidc.rp.OIDCRPModule = idp.authn.oidc.RP
 # Module Owner
 idp.authn.oidc.RP.plugin = net.shibboleth.idp.plugin.authn.oidc.rp
 
-idp.authn.oidc.RP.name = OpenID Relying Party
+idp.authn.oidc.RP.name = OpenID Relying Party Proxy
 idp.authn.oidc.RP.desc = Login flow for java-idp-oidc-rp
-idp.authn.oidc.RP.url = /java-idp-oidc-rpConfiguration
-idp.authn.oidc.RP.1.src = somefile
-idp.authn.oidc.RP.1.dest = conf/to-somefile
-idp.authn.oidc.RP.1.replace = true
+idp.authn.oidc.RP.url = /OIDCRelyingPartyAuthnConfiguration
+
+idp.authn.oidc.RP.1.src =  /net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp.properties
+idp.authn.oidc.RP.1.dest = conf/authn/oidc-rp.properties
+idp.authn.oidc.RP.1.replace = false
+
+idp.authn.oidc.RP.2.src =  /net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-config.xml
+idp.authn.oidc.RP.2.dest = conf/authn/oidc-rp-config.xml
+idp.authn.oidc.RP.2.replace = false
+
+idp.authn.oidc.RP.3.src =  /net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-rp-credentials.xml
+idp.authn.oidc.RP.3.dest = conf/authn/oidc-rp-credentials.xml
+idp.authn.oidc.RP.3.replace = false
+
+idp.authn.oidc.RP.4.src =  /net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-providermetadata-resolvers.xml
+idp.authn.oidc.RP.4.dest = conf/authn/oidc-providermetadata-resolvers.xml
+idp.authn.oidc.RP.4.replace = false
+
+idp.authn.oidc.RP.5.src =  /net/shibboleth/idp/plugin/authn/oidc/rp/conf/authn/oidc-claim-rules.xml
+idp.authn.oidc.RP.5.dest = conf/attributes/oidc-claim-rules.xml
+idp.authn.oidc.RP.5.replace = false
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b59c1b2..7eed45b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
                         <index>true</index>
                         <manifestEntries>
                             <Automatic-Module-Name>${automatic.module.name}</Automatic-Module-Name>
-                            <Sealed>true</Sealed>
+                           <!--  <Sealed>true</Sealed> -->
                         </manifestEntries>
                     </archive>
                 </configuration>

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


More information about the commits mailing list