[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: Wed Oct 15 10:21:49 2014
New Revision: 6712

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6712&view=rev
Log:
Checkpoint work on consent. Implement three toggleable consent methods.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeConsentFlowDescriptorLookupStrategy.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-beans.xml
    trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-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-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/AttributeConsentFlowDescriptor.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AllowGlobalAttributeConsentPredicate.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/EnablePerAttributeConsentPredicate.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=6712&r1=6711&r2=6712&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 Wed Oct 15 10:21:49 2014
@@ -1,11 +1,38 @@
 # Messages related to attribute consent.
 
-idp.attribute-consent.title = Attribute Consent
+idp.attributeConsent.title                        = Attribute Consent
 
-idp.attribute-consent.submit = Confirm
+idp.attributeConsent.attributesHeader             = Data Requested by Service
 
-idp.attribute-consent.alwaysRequireConsent = Ask me again at next login
+idp.attributeConsent.serviceNameLabel             = You are about to access the service:
+idp.attributeConsent.of                           = of
+idp.attributeConsent.serviceDescriptionLabel      = Description as provided by this service:
 
-idp.attribute-consent.rememberConsent = Only ask me again if data changes
+idp.attributeConsent.informationURLLabel          = Additional information about the service
+idp.attributeConsent.privacyStatementURLLabel     = Data privacy information of the service
 
-idp.attribute-consent.globalConsent = Do not ask me again
+idp.attributeConsent.showDetails                  = show details
+
+idp.attributeConsent.accept                       = Accept
+idp.attributeConsent.reject                       = Reject
+idp.attributeConsent.rejectMessage                = If you reject that the data about you is sent to the described service, you will not be able to continue to the service because it requires your data to work properly. In that case, close the web browser windows to abort the login.
+
+idp.attributeConsent.confirmationQuestion         = The data above is requested to access the service. Do you accept that this data about you is sent to the service whenever you access it?
+
+idp.attributeConsent.consentMethod                = Select a data release consent duration :
+idp.attributeConsent.consentMethodRevoke          = This setting can be revoked at any time with the checkbox on the login page.
+
+idp.attributeConsent.doNotRememberConsent         = Ask me again at next login
+idp.attributeConsent.doNotRememberConsentItem1    = I agree to send my data this time.
+idp.attributeConsent.doNotRememberConsentItem2    =
+idp.attributeConsent.doNotRememberConsentItem3    =
+
+idp.attributeConsent.rememberConsent              = Ask me again if data changes
+idp.attributeConsent.rememberConsentItem1         = I agree that the same data will be sent automatically to this service in the future.
+idp.attributeConsent.rememberConsentItem2         = 
+idp.attributeConsent.rememberConsentItem3         =
+
+idp.attributeConsent.globalConsent                = Do not ask me again
+idp.attributeConsent.globalConsentItem1           = I agree that <strong>all</strong> of my data will be released to <strong>any</strong> service.
+idp.attributeConsent.globalConsentItem2           = 
+idp.attributeConsent.globalConsentItem3           = 

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=6712&r1=6711&r2=6712&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 Wed Oct 15 10:21:49 2014
@@ -18,7 +18,9 @@

[... 412 lines stripped ...]