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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Oct 10 18:28:52 2014
New Revision: 6674

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6674&view=rev
Log:
Checkpoint work on attribute consent UI.

Added:
    trunk/idp-war/src/main/webapp/css/consent.css   (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/views/post-authn/consent/attribute-consent.vm

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml?rev=6674&r1=6673&r2=6674&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/consent/attribute-consent/attribute-consent-beans.xml Fri Oct 10 18:28:52 2014
@@ -10,6 +10,9 @@
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+    
+    <bean id="SetRPUIInformation" class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
 
     <bean id="AllowGlobalAttributeConsentPredicate" class="net.shibboleth.idp.consent.logic.AllowGlobalAttributeConsentPredicate" scope="prototype" />
 

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=6674&r1=6673&r2=6674&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 Fri Oct 10 18:28:52 2014
@@ -15,6 +15,7 @@
         <evaluate expression="InitializeConsentContext" />
         <evaluate expression="InitializeAttributeConsentContext" />
         <evaluate expression="PopulateAttributeConsentContext" />
+         <evaluate expression="SetRPUIInformation" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="TestForRevokeConsent" />
     </action-state>
@@ -76,6 +77,9 @@
 
     <view-state id="DisplayAttributeReleasePage" view="#{flowRequestContext.activeFlow.id}">
         <on-render>
+            <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
+            <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
+            <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.ui.context.RelyingPartyUIContext))" result="viewScope.rpUIContext" />
             <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" />

Modified: trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm?rev=6674&r1=6673&r2=6674&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm (original)
+++ trunk/idp-conf/src/main/resources/views/post-authn/consent/attribute-consent.vm Fri Oct 10 18:28:52 2014
@@ -10,58 +10,93 @@
 #else
     #set ($inputType = "hidden")
 #end
+#set ($rpContext = $profileRequestContext.getSubcontext('net.shibboleth.idp.profile.context.RelyingPartyContext') )
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <head>
         <meta charset="utf-8" />
-        <title>#springMessageText("idp.attribute-consent.title" "Attribute Consent")</title>
-        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/main.css"/>
+        <link rel="stylesheet" type="text/css" href="$request.getContextPath()/css/consent.css"/>
+        <title>#springMessageText("idp.attributeConsent.title" "Attribute Consent")</title>
     </head>
     <body>
-        <div class="wrapper">
-            <div class="container">
-                <header>

[... 115 lines stripped ...]