[java-idp-oidc] branch main updated: Adjust bean name for token profile.
Scott Cantor
cantor.2 at osu.edu
Tue Feb 15 13:03:19 UTC 2022
This is an automated email from the git hooks/post-receive script.
scantor 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=46032f06d7a992f7e32b3aa1388f4eb9d54632be
The following commit(s) were added to refs/heads/main by this push:
new 46032f06 Adjust bean name for token profile.
46032f06 is described below
commit 46032f06d7a992f7e32b3aa1388f4eb9d54632be
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 15 08:03:15 2022 -0500
Adjust bean name for token profile.
---
.../idp/service/relying-party/postconfig.xml | 44 +++++++++++-----------
.../src/test/resources/conf/relying-party.xml | 10 ++---
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
index acc6f2dd..ba46804f 100644
--- a/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
+++ b/idp-oidc-extension-impl/src/main/resources/META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml
@@ -38,10 +38,6 @@
p:encodedAttributes="%{idp.oidc.encodedAttributes:%{idp.oidc.embeddedAttributes:}}"
p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}" />
- <bean id="OIDC.Token" parent="AbstractOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration"
- p:grantTypes="%{idp.oauth2.grantTypes:authorization_code,refresh_token}" />
-
<bean id="OIDC.UserInfo" parent="AbstractOIDCProfile" lazy-init="true"
class="net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration"
p:issuer-ref="issuer"
@@ -65,6 +61,10 @@
class="net.shibboleth.oidc.profile.config.OIDCPublishKeySetConfiguration"
p:securityConfiguration-ref="shibboleth.oidc.PublishKeySetSecurityConfiguration" />
+ <bean id="OAUTH2.Token" parent="AbstractOIDCSSOProfile" lazy-init="true"
+ class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration"
+ p:grantTypes="%{idp.oauth2.grantTypes:authorization_code,refresh_token}" />
+
<bean id="OAUTH2.TokenAudience" parent="AbstractOIDCProfile" lazy-init="true"
class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration"
p:issuer-ref="issuer"
@@ -281,24 +281,6 @@
</property>
</bean>
- <bean id="OIDC.Token.MDDriven" parent="AbstractMDDrivenOIDCSSOProfile" lazy-init="true"
- class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration">
- <property name="grantTypesLookupStrategy">
- <bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="grantTypes">
- <property name="defaultValue">
- <bean parent="shibboleth.CommaDelimStringArray">
- <constructor-arg type="java.lang.String"
- value="%{idp.oauth2.grantTypes:authorization_code,refresh_token}" />
- </bean>
- </property>
- </bean>
- </property>
- <property name="refreshTokenLifetimeLookupStrategy">
- <bean parent="shibboleth.MDDrivenDurationProperty" p:propertyName="refreshTokenLifetime"
- p:defaultValue="%{idp.oidc.refreshToken.defaultLifetime:PT2H}" />
- </property>
- </bean>
-
<bean id="OIDC.UserInfo.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
class="net.shibboleth.oidc.profile.config.OIDCUserInfoConfiguration">
<property name="issuerLookupStrategy">
@@ -369,6 +351,24 @@
</property>
</bean>
+ <bean id="OAUTH2.Token.MDDriven" parent="AbstractMDDrivenOIDCSSOProfile" lazy-init="true"
+ class="net.shibboleth.oidc.profile.config.OIDCTokenConfiguration">
+ <property name="grantTypesLookupStrategy">
+ <bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="grantTypes">
+ <property name="defaultValue">
+ <bean parent="shibboleth.CommaDelimStringArray">
+ <constructor-arg type="java.lang.String"
+ value="%{idp.oauth2.grantTypes:authorization_code,refresh_token}" />
+ </bean>
+ </property>
+ </bean>
+ </property>
+ <property name="refreshTokenLifetimeLookupStrategy">
+ <bean parent="shibboleth.MDDrivenDurationProperty" p:propertyName="refreshTokenLifetime"
+ p:defaultValue="%{idp.oidc.refreshToken.defaultLifetime:PT2H}" />
+ </property>
+ </bean>
+
<bean id="OAUTH2.TokenAudience.MDDriven" parent="AbstractMDDrivenOIDCProfile" lazy-init="true"
class="net.shibboleth.oidc.profile.oauth2.config.OAuth2TokenAudienceConfiguration">
<property name="issuerLookupStrategy">
diff --git a/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml b/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
index 8c4942c8..0519b463 100644
--- a/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
+++ b/idp-oidc-extension-impl/src/test/resources/conf/relying-party.xml
@@ -26,7 +26,7 @@
<ref bean="OIDC.Keyset" />
<ref bean="OIDC.Registration" />
<ref bean="OIDC.Configuration" />
- <ref bean="OIDC.Token" />
+ <ref bean="OAUTH2.Token" />
<ref bean="OAUTH2.TokenAudience" />
<ref bean="OAUTH2.Introspection" />
<ref bean="OAUTH2.Revocation" />
@@ -48,9 +48,9 @@
<ref bean="SAML2.AttributeQuery.MDDriven" />
<ref bean="SAML2.ArtifactResolution.MDDriven" />
<ref bean="OIDC.SSO.MDDriven" />
- <ref bean="OIDC.Token.MDDriven" />
<ref bean="OIDC.UserInfo.MDDriven" />
<ref bean="OIDC.Registration.MDDriven" />
+ <ref bean="OAUTH2.Token.MDDriven" />
<ref bean="OAUTH2.Introspection.MDDriven" />
<ref bean="OAUTH2.Revocation.MDDriven" />
</list>
@@ -62,7 +62,7 @@
<property name="profileConfigurations">
<list>
<bean parent="OIDC.SSO.MDDriven" p:forcePKCE="false" p:allowPKCEPlain="true"/>
- <bean parent="OIDC.Token.MDDriven" p:forcePKCE="false" p:allowPKCEPlain="true"/>
+ <bean parent="OAUTH2.Token.MDDriven" p:forcePKCE="false" p:allowPKCEPlain="true"/>
</list>
</property>
</bean>
@@ -70,7 +70,7 @@
<property name="profileConfigurations">
<list>
<bean parent="OIDC.SSO.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="true"/>
- <bean parent="OIDC.Token.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="true"/>
+ <bean parent="OAUTH2.Token.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="true"/>
</list>
</property>
</bean>
@@ -78,7 +78,7 @@
<property name="profileConfigurations">
<list>
<bean parent="OIDC.SSO.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="false"/>
- <bean parent="OIDC.Token.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="false"/>
+ <bean parent="OAUTH2.Token.MDDriven" p:forcePKCE="true" p:allowPKCEPlain="false"/>
</list>
</property>
</bean>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list