[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow....

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Nov 21 00:51:27 2014
New Revision: 6985

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6985&view=rev
Log:
Use "_shib_idp" as prefix for parameters rather than "_idp".

Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ExtractConsent.java

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml?rev=6985&r1=6984&r2=6985&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml Fri Nov 21 00:51:27 2014
@@ -26,7 +26,7 @@
     <!-- If consent revocation was requested, skip reading from storage. -->
 
     <decision-state id="TestForRevokeConsent">
-        <if test="requestParameters._idp_revokeConsent" then="RevokeConsent" else="ReadConsentFromStorage" />
+        <if test="requestParameters._shib_idp_revokeConsent" then="RevokeConsent" else="ReadConsentFromStorage" />
     </decision-state>
 
     <!-- Revoke consent by deleting consent storage records. -->
@@ -109,7 +109,7 @@
     <!-- If global consent was given by user, create appropriate storage result and end flow. -->
 
     <decision-state id="TestForGlobalConsent">
-        <if test="requestParameters._idp_consentOptions == '_idp_globalConsent'" then="GlobalConsent" else="ExtractConsent" />
+        <if test="requestParameters._shib_idp_consentOptions == '_shib_idp_globalConsent'" then="GlobalConsent" else="ExtractConsent" />
     </decision-state>
 
     <action-state id="GlobalConsent">
@@ -132,7 +132,7 @@
     <!-- Determine whether consent should be stored or not. -->
     
     <decision-state id="TestForDoNotRememberConsent">
-        <if test="requestParameters._idp_consentOptions == '_idp_doNotRememberConsent'" then="ReleaseAttributes" else="CreateResult" />
+        <if test="requestParameters._shib_idp_consentOptions == '_shib_idp_doNotRememberConsent'" then="ReleaseAttributes" else="CreateResult" />
     </decision-state>
 
 

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml?rev=6985&r1=6984&r2=6985&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml Fri Nov 21 00:51:27 2014
@@ -40,7 +40,7 @@
     </view-state>
     
     <decision-state id="TestForCheckbox">
-        <if test="requestParameters.consentIds != null" then="ExtractConsent" else="RequireCheckbox" />
+        <if test="requestParameters._shib_idp_consentIds != null" then="ExtractConsent" else="RequireCheckbox" />
     </decision-state>
     
     <action-state id="RequireCheckbox">

Modified: trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm?rev=6985&r1=6984&r2=6985&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm (original)
+++ trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm Fri Nov 21 00:51:27 2014
@@ -80,7 +80,7 @@
                                         #else
                                             #set ($inputType = "hidden")
                                         #end
-                                        <input id="$attribute.id" type="$inputType" name="consentIds" value="$encoder.encodeForHTML($attribute.id)" checked />
+                                        <input id="$attribute.id" type="$inputType" name="_shib_idp_consentIds" value="$encoder.encodeForHTML($attribute.id)" checked />
                                     </td>
                                 </tr>
                             #end
@@ -103,7 +103,7 @@
                     #end
                     #if ($attributeReleaseFlowDescriptor.doNotRememberConsentAllowed)
                         <p>
-                            <input id="_idp_doNotRememberConsent" type="radio" name="_idp_consentOptions" value="_idp_doNotRememberConsent" />

[... 54 lines stripped ...]