[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm ...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Oct  6 16:54:57 2014
New Revision: 6641

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6641&view=rev
Log:
Checkpoint work on consent. Simplify the consent context, pass consent IDs rather than serialized forms during extraction of user input.

Modified:
    trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm
    trunk/idp-conf/src/main/resources/views/post-authn/consent/terms-of-use.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/Consent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/context/ConsentContext.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateAttributeConsentChoices.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/IsAttributeConsentRequired.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/ReleaseAttributes.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/ReadConsentFromStorage.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/CreateTermsOfUseChoice.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequired.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/storage/ConsentSerializer.java

Modified: trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm (original)
+++ trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm Mon Oct  6 16:54:57 2014
@@ -22,13 +22,11 @@
                     <form action="$flowExecutionUrl" method="post"  >
                         <table>
                             #foreach($attribute in $attributeConsentContext.getProcessedAttributes().values())
-                                #set($serializedValue = ${consentContext.getConsentChoices().get($attribute.id).getSecond()} )
-                                #set($encodedValue = $encoder.encodeForHTML($serializedValue) )
                                 <tr>
                                     <td>$attributeDisplayNameFunction.apply($attribute)</td>
                                     <td>$attribute.values</td>
                                     <td>
-                                        <input type="hidden" name="consents" value="${encodedValue}" />
+                                        <input type="hidden" name="consents" value="$encoder.encodeForHTML($attribute.id)" />
                                     </td>
                                 </tr>
                             #end

Modified: trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm?rev=6641&r1=6640&r2=6641&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm (original)
+++ trunk/idp-conf/src/main/resources/views/post-authn/consent/per-attribute-consent.vm Mon Oct  6 16:54:57 2014
@@ -23,13 +23,11 @@
                     <form action="$flowExecutionUrl" method="post"  >
                         <table>
                             #foreach($attribute in $attributeConsentContext.getProcessedAttributes().values())
-                                #set($serializedValue = ${consentContext.getConsentChoices().get($attribute.id).getSecond()} )
-                                #set($encodedValue = $encoder.encodeForHTML($serializedValue) )
                                 <tr>
                                     <td>$attributeDisplayNameFunction.apply($attribute)</td>
                                     <td>$attribute.values</td>
                                     <td>
-                                        <input type="checkbox" name="consents" value="${encodedValue}" />
+                                        <input type="checkbox" name="consents" value="$encoder.encodeForHTML($attribute.id)" />
                                     </td>
                                 </tr>
                             #end

Modified: trunk/idp-conf/src/main/resources/views/post-authn/consent/terms-of-use.vm

[... 699 lines stripped ...]