[java-idp-plugin-duo] 02/04: Change duo beans user config import to the old duo-authn-config.xml

[Phil Smart]

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

philsmart pushed a commit to branch master
in repository java-idp-plugin-duo.

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

commit 4f689b9e01d487f218457f52407884aaaf9c03aa
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Jul 31 13:28:23 2020 +0100

    Change duo beans user config import to the old duo-authn-config.xml
---
 .../idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
index 8d226d6..d87d6a0 100644
--- a/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
+++ b/idp-duo-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/authn/DuoOIDC/duo-oidc-authn-beans.xml
@@ -39,13 +39,9 @@
     <!-- FIXME: For current SWF flow tests the client registry and factory beans from postconfig.xml
      need to be copied into here, will fix. -->
         
-        
-    <!-- Can override one or more of the beans above. 
-        TODO: uses a property placeholder not SpEL as import happens before SpEL eval. Also this
-        is different to the internal ones, which are not changeable. Also, what should the default
-        be.-->
-   
-    <import resource="${idp.duo.oidc.config.user:../../../conf/authn/duo-oidc-authn-config.xml}" /> 
+          
+    <!-- Can override one or more of the beans above. -->
+    <import resource="%{idp.home}/conf/authn/duo-authn-config.xml" />
 
    
     <!-- Prototype per conversation beans -->

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