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

[noreply at shibboleth.net]

Author: rdw
Date: Thu Mar 12 09:43:47 2015
New Revision: 7409

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7409&view=rev
Log:
IDP-635 Wire into consent flow.  This required a change in parameterization which is reflected in the tests.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunctionTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml?rev=7409&r1=7408&r2=7409&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml Thu Mar 12 09:43:47 2015
@@ -37,7 +37,7 @@
         p:attributeIdMatchExpression="#{getObject('shibboleth.consent.attribute-release.MatchExpression')}" />
 
     <!-- Functions to return a storage key consisting of the user identifier. -->
-    
+
     <bean id="shibboleth.consent.PrincipalConsentStorageKey"
         class="com.google.common.base.Functions" factory-method="compose"
         c:g-ref="shibboleth.PrincipalNameLookup.Subject"
@@ -103,13 +103,12 @@
         class="net.shibboleth.idp.consent.flow.PopulateConsentContext" scope="prototype"
         c:currentConsentsFunction-ref="AttributeReleaseConsentFunction"  />
 
+    <bean id="FallbackLanguages" parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.ui.fallbackLanguages:}" />
+
     <bean id="SetRPUIInformation"
             class="net.shibboleth.idp.ui.impl.SetRPUIInformation" scope="prototype"
-            p:httpServletRequest-ref="shibboleth.HttpServletRequest">
-        <property name="fallbackLanguages">
-            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.ui.fallbackLanguages:}" />
-        </property>
-    </bean>
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+            p:fallbackLanguages-ref="FallbackLanguages"/>
 
     <bean id="RevokeConsent"
         class="net.shibboleth.idp.consent.flow.storage.RevokeConsent" scope="prototype"
@@ -160,4 +159,4 @@
         p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest" />
 
-</beans>
+</beans>

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=7409&r1=7408&r2=7409&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 Thu Mar 12 09:43:47 2015
@@ -109,7 +109,7 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
             <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
-            <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getLocale())" result="viewScope.attributeDisplayNameFunction" />
+            <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getNativeRequest(), FallbackLanguages)" result="viewScope.attributeDisplayNameFunction" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.AttributeReleaseContext))" result="viewScope.attributeReleaseContext" />
             <evaluate expression="SetRPUIInformation.getRPUIContextCreateStrategy().apply(opensamlProfileRequestContext)" result="viewScope.rpUIContext" />

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/AttributeDisplayNameFunction.java?rev=7409&r1=7408&r2=7409&view=diff
==============================================================================

[... 74 lines stripped ...]