[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 17:51:49 2014
New Revision: 6658

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6658&view=rev
Log:
Abstract attribute consent flow. FIx bug in views.

Added:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/abstract-attribute-consent/abstract-attribute-consent-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/per-attribute-consent/per-attribute-consent-flow.xml
    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

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml?rev=6658&r1=6657&r2=6658&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-flow.xml Wed Oct  8 17:51:49 2014
@@ -1,75 +1,8 @@
  <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">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
+      parent="post-authn/consent/abstract-attribute-consent" >
 
-    <!-- Placeholder flow for attribute release consent. -->
+    <bean-import resource="../abstract-attribute-consent/abstract-attribute-consent-beans.xml" />
 
-    <!-- Rudimentary impediment to direct execution of subflow. -->
-    <input name="calledAsSubflow" type="boolean" required="true" />
-
-    <action-state id="AttributeConsentSetup">
-        <evaluate expression="InitializeConsentContext" />
-        <evaluate expression="InitializeAttributeConsentContext" />
-        <evaluate expression="PopulateAttributeConsentContext" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="RevokeConsent" />
-    </action-state>
-
-    <action-state id="RevokeConsent">
-        <evaluate expression="RevokeConsent" />
-        <evaluate expression="'proceed'" />
-        <transition on="RevokeConsent" to="IsAttributeConsentRequired" />
-        <transition on="proceed" to="ReadConsentFromStorage" />
-    </action-state>
-    
-    <action-state id="ReadConsentFromStorage">
-        <evaluate expression="ReadConsentFromStorage" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="IsAttributeConsentRequired" />
-    </action-state>
-
-    <action-state id="IsAttributeConsentRequired">
-        <evaluate expression="IsAttributeConsentRequired" />
-        <evaluate expression="'proceed'" />
-        <transition on="ConsentNotRequired" to="ReleaseAttributes" />
-        <transition on="proceed" to="CreateAttributeConsentChoices" />
-    </action-state>
-    
-    <action-state id="CreateAttributeConsentChoices">
-        <evaluate expression="CreateAttributeConsentChoices" />
-        <evaluate expression="'proceed'" />
-        <transition on="proceed" to="DisplayAttributeReleasePage" />
-    </action-state>
-    
-    <view-state id="DisplayAttributeReleasePage" view="#{flowRequestContext.activeFlow.id}">
-        <on-render>
-            <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
-            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
-            <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
-            <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getLocale())" result="requestScope.attributeDisplayNameFunction" />
-            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />

[... 157 lines stripped ...]