[java-idp-plugin-totp] branch main updated: JTOTP-12 - Messages can't be overridden by deployer

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-plugin-totp.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-totp.git;a=commit;h=de6286ae6cee62f1d1fdd6bec8e9fea1a4e7a922

The following commit(s) were added to refs/heads/main by this push:
     new de6286a  JTOTP-12 - Messages can't be overridden by deployer
de6286a is described below

commit de6286ae6cee62f1d1fdd6bec8e9fea1a4e7a922
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Apr 18 15:26:15 2024 -0400

    JTOTP-12 - Messages can't be overridden by deployer
    
    https://shibboleth.atlassian.net/browse/JTOTP-12
---
 .../net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
index 640ff7c..d635674 100644
--- a/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
+++ b/totp-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/TOTP/TOTP-beans.xml
@@ -14,9 +14,18 @@
 
     <import resource="TOTP-authenticator.xml" />
 
+    <bean id ="ExtendedMessageSourceResources" parent="shibboleth.ListCombiner"
+          p:firstList-ref="#{'%{idp.message.resources:shibboleth.MessageSourceResources}'.trim()}" >
+        <property name="secondList">
+            <util:list >
+                <value>classpath:/net/shibboleth/idp/plugin/authn/totp/messages</value>
+            </util:list>
+        </property>
+    </bean>
+
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
         p:cacheSeconds="%{idp.message.cacheSeconds:300}"
-        p:basenames="classpath:/net/shibboleth/idp/plugin/authn/totp/messages"
+        p:basenames-ref="ExtendedMessageSourceResources"
         p:defaultEncoding="UTF-8" />
 
     <!-- Default username comes from previous c14n or session. -->        

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.