[java-idp-oidc] branch main updated: JOIDC-192 - Remove dashes from subject claim examples

[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=88645a88ede7b8460c347fd179aca66cedeccf36

The following commit(s) were added to refs/heads/main by this push:
     new 88645a88 JOIDC-192 - Remove dashes from subject claim examples
88645a88 is described below

commit 88645a88ede7b8460c347fd179aca66cedeccf36
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jan 22 09:34:03 2024 -0500

    JOIDC-192 - Remove dashes from subject claim examples
    
    https://shibboleth.atlassian.net/browse/JOIDC-192
---
 .../idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml    | 8 ++++----
 .../idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml  | 4 ++--
 .../idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml
index cdd4293d..c2ac3436 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-filter.xml
@@ -22,10 +22,10 @@
         <AttributeRule attributeID="subject">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
-        <AttributeRule attributeID="subject-public">
+        <AttributeRule attributeID="subjectPublic">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
-        <AttributeRule attributeID="subject-pairwise">
+        <AttributeRule attributeID="subjectPairwise">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
     </AttributeFilterPolicy>
@@ -44,10 +44,10 @@
         <AttributeRule attributeID="subject">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
-        <AttributeRule attributeID="subject-public">
+        <AttributeRule attributeID="subjectPublic">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
-        <AttributeRule attributeID="subject-pairwise">
+        <AttributeRule attributeID="subjectPairwise">
             <PermitValueRule xsi:type="ANY" />
         </AttributeRule>
     </AttributeFilterPolicy>
diff --git a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml
index 22a353d0..f299e417 100644
--- a/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml
+++ b/idp-oidc-extension-impl/src/main/resources/net/shibboleth/idp/plugin/oidc/op/conf/examples/oidc-attribute-resolver.xml
@@ -26,13 +26,13 @@
     this is simply to provide a "working" out of the box example. Using something
     more stable, managed by IDM infrastructure, is the advisable approach.
     -->
-    <AttributeDefinition id="subject-public" xsi:type="Scoped" scope="%{idp.scope}"
+    <AttributeDefinition id="subjectPublic" xsi:type="Scoped" scope="%{idp.scope}"
             activationConditionRef="shibboleth.oidc.Conditions.PublicRequired">
         <InputAttributeDefinition ref="uid" />
         <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="sub" />
     </AttributeDefinition>
 
-    <AttributeDefinition id="subject-pairwise" xsi:type="Scoped" scope="%{idp.scope}"
+    <AttributeDefinition id="subjectPairwise" xsi:type="Scoped" scope="%{idp.scope}"
             activationConditionRef="shibboleth.oidc.Conditions.PairwiseRequired">
         <InputDataConnector ref="computedSubjectId" attributeNames="subjectId"/>
         <AttributeEncoder xsi:type="oidc:OIDCScopedString" name="sub" />
diff --git a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java
index 3ee2a1f9..8f4d20e2 100644
--- a/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java
+++ b/idp-oidc-extension-impl/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/flow/AbstractOidcFlowTest.java
@@ -424,7 +424,7 @@ public abstract class AbstractOidcFlowTest extends AbstractFlowTest {
     
     protected void storeConsent(final StorageService storageService, final String uid, final String clientId,
             final String... ids) throws IOException {
-        final StringBuilder consented = new StringBuilder("[{\"id\":\"subject-public\"}");
+        final StringBuilder consented = new StringBuilder("[{\"id\":\"subjectPublic\"}");
         for (final String id : ids) {
             consented.append(",{\"id\":\"" + id + "\"}");
         }

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