[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/errors.xml idp-conf/src/main/resources/co...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 11:59:22 2014
New Revision: 6967

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6967&view=rev
Log:
- Fix global consent revocation check
- Turn attribute consent Reject button into a NoConsent local error event

Modified:
    trunk/idp-conf/src/main/resources/conf/errors.xml
    trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java

Modified: trunk/idp-conf/src/main/resources/conf/errors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/errors.xml?rev=6967&r1=6966&r2=6967&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/errors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/errors.xml Thu Nov 20 11:59:22 2014
@@ -25,6 +25,7 @@
     <!-- List of events to trap and handle with local views, without returning to SPs. -->
     <util:list id="shibboleth.LocalEvents">
         <value>ContextCheckDenied</value>
+        <value>NoConsent</value>
         <value>RuntimeException</value>
         <!--
         <value>IdentitySwitch</value>

Modified: trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/messages.properties?rev=6967&r1=6966&r2=6967&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/messages.properties Thu Nov 20 11:59:22 2014
@@ -63,10 +63,6 @@
 
 idp.attribute-release.accept                       = Accept
 idp.attribute-release.reject                       = Reject
-idp.attribute-release.rejectMessage                = If you decline to send your information to the requester, \
-                                                     you will not be able to continue to the service because it \
-                                                     requires information about you to work properly. In that case, \
-                                                     close the web browser to abandon the login.
 
 idp.attribute-release.confirmationQuestion         = The information above would be shared with the service if you proceed. \
                                                      Do you agree to release this information to the service every time you access it?

Modified: trunk/idp-conf/src/main/resources/conf/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/messages.properties?rev=6967&r1=6966&r2=6967&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/messages.properties Thu Nov 20 11:59:22 2014
@@ -38,6 +38,8 @@
 UnableToSign = unexpected
 UnableToEncrypt = unexpected
 
+NoConsent = no-consent
+
 RuntimeException = runtime-error
 
 # Exception to error key mappings
@@ -51,6 +53,11 @@
 
 context-check-denied.title = Access Denied
 context-check-denied.message = You are not eligible for the service requested.
+
+no-consent.title = Release of Information Prevented
+no-consent.message = At your request, the release of your information has been blocked. If you wish to \
+                      change your decision, you may access the service again and approve the release in the \
+                      future.
 
 async-logout.title = Logout Completed
 async-logout.message = Logout complete. Service provider requested no response.
@@ -72,21 +79,21 @@
 
 stale.title = Stale Request
 stale.message = <p>You may be seeing this page because you used the Back button while browsing a \
-                secure web site or application. Alternatively, you may have mistakenly bookmarked \
-                the web login form instead of the actual web site you wanted to bookmark or used a \
-                link created by somebody else who made the same mistake.</p> \
-                <br/> \
-                <p>Left unchecked, this can cause errors on some browsers or result in you returning to \
-                the web site you tried to leave, so this page is presented instead.</p>
+                 secure web site or application. Alternatively, you may have mistakenly bookmarked \
+                 the web login form instead of the actual web site you wanted to bookmark or used a \
+                 link created by somebody else who made the same mistake.</p> \
+                 <br/> \

[... 93 lines stripped ...]