[java-identity-provider] branch main updated: IDP-2304 - Fix view

[Tom Zeller]

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

tzeller pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=f67f814567d7c961109c7f26c546d657c9f0b3b3

The following commit(s) were added to refs/heads/main by this push:
     new f67f81456 IDP-2304 - Fix view
f67f81456 is described below

commit f67f814567d7c961109c7f26c546d657c9f0b3b3
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Tue Aug 27 16:40:03 2024 -0500

    IDP-2304 - Fix view
    
    Previous changes seemed to support per-attribute-value consent - only
    per-attribute consent is supported.
    
    https://shibboleth.atlassian.net/browse/IDP-2304
---
 .../idp/module/views/intercept/attribute-release.vm      | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/intercept/attribute-release.vm b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/intercept/attribute-release.vm
index ee9ad92e7..00d860018 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/intercept/attribute-release.vm
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/views/intercept/attribute-release.vm
@@ -83,13 +83,14 @@ $response.addHeader("Content-Security-Policy", "script-src 'none'")
                 #parse("csrf/csrf.vm")
                 <div class="boxed">
                     <h2>#springMessageText("idp.attribute-release.attributesHeader", "Information to be Provided to Service")</h2>
-
                     #foreach ($attribute in $attributeReleaseContext.getConsentableAttributes().values())
                         #if ($attributeReleaseFlowDescriptor.perAttributeConsentEnabled)
                             <fieldset>
-                            <legend><p>$encoder.encodeForHTML($attributeDisplayNameFunction.apply($attribute))</p></legend>
+                                <input id="$attribute.id" type="checkbox" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)" checked>
+                                <label for="$attribute.id">$encoder.encodeForHTML($attributeDisplayNameFunction.apply($attribute))</label>
                         #else
                             <p>$encoder.encodeForHTML($attributeDisplayNameFunction.apply($attribute))</p>
+                            <input id="$attribute.id" type="hidden" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)">
                         #end
                         #foreach ($value in $attribute.values)
                             #if ($replaceDollarWithNewline)
@@ -97,21 +98,12 @@ $response.addHeader("Content-Security-Policy", "script-src 'none'")
                             #else
                                 #set ($encodedValue = $encoder.encodeForHTML($value.getDisplayValue()))
                             #end
-                            <p>
-                            #if ($attributeReleaseFlowDescriptor.perAttributeConsentEnabled)
-                                <input id="$attribute.id" type="checkbox" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)" checked>
-                                <label for="$attribute.id"><strong>$encodedValue</strong></label>
-                            #else
-                                <strong>$encodedValue</strong>
-                                <input id="$attribute.id" type="hidden" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)" checked>
-                            #end
-                            </p>
+                            <p><strong>$encodedValue</strong></p>
                         #end
                         #if ($attributeReleaseFlowDescriptor.perAttributeConsentEnabled)
                             </fieldset>
                         #end
                     #end
-                    </fieldset>
                 </div>
 
                 <p>#springMessageText("idp.attribute-release.confirmationQuestion", "The information above would be shared with the service if you proceed. Do you agree to release this information to the service every time you access it?")</p>

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