[java-idp-oidc] branch main updated: JOIDC-49 - The property for encoding attributes in tokens is named wrong

[Scott Cantor]

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=39b9e789f5f70ef4e211eaa6a611d5bd868bd21a

The following commit(s) were added to refs/heads/main by this push:
       new  39b9e789  JOIDC-49 - The property for encoding attributes in tokens is named wrong
39b9e789 is described below

commit 39b9e789f5f70ef4e211eaa6a611d5bd868bd21a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 22 13:55:36 2021 -0400

    JOIDC-49 - The property for encoding attributes in tokens is named wrong
    
    https://issues.shibboleth.net/jira/browse/JOIDC-49
---
 .../META-INF/net/shibboleth/idp/service/relying-party/postconfig.xml  | 4 ++--
 .../resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc.properties  | 4 ++--
 2 files changed, 4 insertions(+), 4 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 077065f3..7be3273d 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
@@ -29,7 +29,7 @@
         p:forcePKCE="%{idp.oidc.forcePKCE:false}"
         p:allowPKCEPlain="%{idp.oidc.allowPKCEPlain:false}"
         p:encodeConsentInTokens="%{idp.oidc.encodeConsentInTokens:false}"
-        p:encodedAttributes="%{idp.oidc.encodedAttributes:}"
+        p:encodedAttributes="%{idp.oidc.encodedAttributes:%{idp.oidc.embeddedAttributes:}}"
         p:alwaysIncludedAttributes="%{idp.oidc.alwaysIncludedAttributes:}"
         p:deniedUserInfoAttributes="%{idp.oidc.deniedUserInfoAttributes:}" />
         
@@ -202,7 +202,7 @@
             <bean parent="shibboleth.MDDrivenSetProperty" p:propertyName="encodedAttributes">
                 <property name="defaultValue">
                     <bean parent="shibboleth.CommaDelimStringArray">
-                        <constructor-arg type="java.lang.String" value="%{idp.oidc.encodedAttributes:}" />
+                        <constructor-arg type="java.lang.String" value="%{idp.oidc.encodedAttributes:%{idp.oidc.embeddedAttributes:}}" />
                     </bean>
                 </property>
             </bean>
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc.properties b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc.properties
index 9d70b74c..990fcb3e 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc.properties
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/oidc.properties
@@ -54,8 +54,8 @@ idp.signing.oidc.rsa.enc.key = %{idp.home}/credentials/idp-encryption-rsa.jwk
 #idp.service.clientinfo.resources = shibboleth.ClientInformationResolverResources
 
 # Special claim handling rules
-# "Embedded" attributes are encoded and encrypted into the access token
-#idp.oidc.embeddedAttributes =
+# "Encoded" attributes are encrypted and embedded into the access token
+#idp.oidc.encodedAttributes =
 # "Always included" attributes are forced into ID tokens for all response_types
 #idp.oidc.alwaysIncludedAttributes =
 # "Denied" attributes are omitted from the UserInfo token

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