[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use: terms-of...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Oct  7 17:10:07 2014
New Revision: 6649

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6649&view=rev
Log:
Consent revocation is for attributes, not terms-of-use.

Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml?rev=6649&r1=6648&r2=6649&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-beans.xml Tue Oct  7 17:10:07 2014
@@ -19,9 +19,6 @@
 
     <bean id="ReadConsentFromStorage" class="net.shibboleth.idp.consent.flow.storage.ReadConsentFromStorage" scope="prototype" />
 
-    <bean id="RevokeConsent" class="net.shibboleth.idp.consent.flow.storage.RevokeConsent" scope="prototype"
-        p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
-
     <bean id="IsTermsOfUseConsentRequired" class="net.shibboleth.idp.consent.flow.tou.IsTermsOfUseConsentRequired" scope="prototype" />
 
     <bean id="CreateTermsOfUseChoice" class="net.shibboleth.idp.consent.flow.tou.CreateTermsOfUseChoice" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml?rev=6649&r1=6648&r2=6649&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/terms-of-use/terms-of-use-flow.xml Tue Oct  7 17:10:07 2014
@@ -1,8 +1,6 @@
  <flow xmlns="http://www.springframework.org/schema/webflow"
       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">
-
-    <!-- Placeholder flow for attribute release consent. -->
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />
@@ -12,13 +10,6 @@
         <evaluate expression="InitializeTermsOfUseContext" />
         <evaluate expression="PopulateTermsOfUse" />
         <evaluate expression="'proceed'" />
-        <transition on="proceed" to="RevokeConsent" />
-    </action-state>
-
-    <action-state id="RevokeConsent">
-        <evaluate expression="RevokeConsent" />
-        <evaluate expression="'proceed'" />
-        <transition on="RevokeConsent" to="CreateTermsOfUseChoice" />
         <transition on="proceed" to="ReadConsentFromStorage" />
     </action-state>