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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Oct 10 16:38:37 2014
New Revision: 6671

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6671&view=rev
Log:
Checkpoint work on consent.
Implement "global consent" as well as "always require consent".
Collapse attribute consent flows and views.
Remove some unused storage related fields from profile interceptor flow descriptor.

Added:
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalConsentResult.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AllowGlobalAttributeConsentPredicate.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/EnablePerAttributeConsentPredicate.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/GlobalAttributeConsentPredicate.java   (with props)
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/JoinFunction.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties
    trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.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/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
    trunk/idp-conf/src/main/resources/system/conf/post-authn-system.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
    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/ConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageAction.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/PopulateTermsOfUse.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeValueLookupFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/storage/ConsentSerializer.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorFlowDescriptor.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/interceptor/ProfileInterceptorResult.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/WriteProfileInterceptorResultToStorage.java

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties?rev=6671&r1=6670&r2=6671&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/attribute-consent_en.properties Fri Oct 10 16:38:37 2014
@@ -2,4 +2,10 @@
 
 idp.attribute-consent.title = Attribute Consent
 
-idp.attribute-consent.submit = Confirm
+idp.attribute-consent.submit = Confirm
+
+idp.attribute-consent.alwaysRequireConsent = Ask me again at next login
+
+idp.attribute-consent.rememberConsent = Only ask me again if data changes
+
+idp.attribute-consent.globalConsent = Do not ask me again

Modified: trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml?rev=6671&r1=6670&r2=6671&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/post-authn/post-authn.xml Fri Oct 10 16:38:37 2014
@@ -12,35 +12,17 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <!-- TODO use property replacement for storage key attribute id ? -->
-
     <!-- Flows executed after authentication. -->
     <util:list id="shibboleth.PostAuthnFlows">
-        <!--
-        <bean id="post-authn/consent/terms-of-use" parent="shibboleth.consent.TermsOfUseFlow"

[... 1251 lines stripped ...]