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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Oct  8 20:40:39 2014
New Revision: 6660

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6660&view=rev
Log:
Checkpoint work on consent. Use decision-state for consent revocation.

Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml?rev=6660&r1=6659&r2=6660&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml Wed Oct  8 20:40:39 2014
@@ -2,8 +2,6 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
       abstract="true" >
-
-    <!-- Placeholder flow for attribute release consent. -->
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />
@@ -13,14 +11,17 @@
         <evaluate expression="InitializeAttributeConsentContext" />
         <evaluate expression="PopulateAttributeConsentContext" />
         <evaluate expression="'proceed'" />
-        <transition on="proceed" to="RevokeConsent" />
+        <transition on="proceed" to="TestForRevokeConsent" />
     </action-state>
+
+    <decision-state id="TestForRevokeConsent">
+        <if test="requestParameters._idp_revokeConsent" then="RevokeConsent" else="ReadConsentFromStorage" />
+    </decision-state>
 
     <action-state id="RevokeConsent">
         <evaluate expression="RevokeConsent" />
         <evaluate expression="'proceed'" />
-        <transition on="RevokeConsent" to="IsAttributeConsentRequired" />
-        <transition on="proceed" to="ReadConsentFromStorage" />
+        <transition on="proceed" to="IsAttributeConsentRequired" />
     </action-state>
     
     <action-state id="ReadConsentFromStorage">

Modified: trunk/idp-conf/src/main/resources/views/login.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/login.vm?rev=6660&r1=6659&r2=6660&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/login.vm (original)
+++ trunk/idp-conf/src/main/resources/views/login.vm Wed Oct  8 20:40:39 2014
@@ -63,13 +63,12 @@
               <section>
                 <input type="checkbox" name="donotcache" value="1" /> Don't Remember Login
               </section>
-              
-              ## TODO change param name for consent revocation
+
               ## <section>
-              ##  <input id="uApprove.consent-revocation" type="checkbox" name="uApprove.consent-revocation" value="true"/>
+              ##  <input id="_idp_revokeConsent" type="checkbox" name="_idp_revokeConsent" value="true"/>
               ##  Clear data release consent for this service
               ## </section>
-              
+
               <section>
                 <button class="form-element form-button" type="submit" name="_eventId_proceed" >Login</button>
               </section>

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java?rev=6660&r1=6659&r2=6660&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java Wed Oct  8 20:40:39 2014
@@ -71,7 +71,7 @@
         }
 
         final String[] consentParams = request.getParameterValues(CONSENT_IDS_REQUEST_PARAMETER);
-        log.debug("{} Consent paramter values '{}'", getLogPrefix(), consentParams);
+        log.debug("{} Consent parameter values '{}'", getLogPrefix(), consentParams);
         if (consentParams == null) {
             log.debug("{} No consent choices", getLogPrefix());
             // TODO

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java

[... 64 lines stripped ...]