From 6017e30de786ab9defab7eaef53ec8da5f606ee9 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Fri, 19 Feb 2021 16:14:31 +0100
Subject: refactoring of ID Austria connection client and add/update of jUnit
 tests

---
 .../src/main/resources/eidas_v2_auth.beans.xml     | 60 ++++++++--------------
 .../eidas_v2_auth_ref_impl_config.beans.xml        | 39 ++++++++++++++
 .../messages/eidas_connector_message.properties    | 15 ++++++
 3 files changed, 75 insertions(+), 39 deletions(-)
 create mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
 create mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 019cb03c..a720c1f8 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -11,8 +11,8 @@
 
   <context:annotation-config />
 
-  <import
-    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
+  <bean id="eidasConnectorMessageSource"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.config.EidasConnectorMessageSource"/>
 
   <bean id="SZRClientForeIDAS"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient" />
@@ -22,29 +22,7 @@
 
   <bean id="ZmrClientForeIDAS"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.zmr.DummyZmrClient" />
-
-  <bean id="specificConnectorAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="eidas-attributes.xml" />
-  </bean>
-
-  <bean id="specificAdditionalAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="additional-attributes.xml" />
-  </bean>
-
-  <bean id="specificConnectorAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
-  </bean>
-
-  <bean id="specificConnectorAdditionalAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
-  </bean>
-
+        
   <bean id="eIDASAuthModule"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationModulImpl">
     <property name="priority" value="2" />
@@ -88,6 +66,24 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.ItSpecificDetailSearchProcessor">
   </bean>
 
+
+  <!-- ID Austria client specific services -->
+  <bean id="idAustriaClientAuthCredentialProvider"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.provider.IdAustriaClientAuthCredentialProvider" />
+
+  <bean id="idAustriaClientAuthMetadataProvider"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.provider.IdAustriaClientAuthMetadataProvider" />
+
+  <bean id="idAustriaClientMetadataHealthCheck"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.provider.IdAustriaClientAuthHealthCheck" />
+
+  <bean id="idAustriaClientAuthMetadataController"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.controller.IdAustriaClientAuthMetadataController" />
+
+  <bean id="idAustriaClientAuthSignalController"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.controller.IdAustriaClientAuthSignalController" />
+
+
   <!-- Authentication Process Tasks -->
   <bean id="ConnecteIDASNodeTask"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask"
@@ -134,19 +130,5 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveGuiAustrianResidenceResponseTask"
         scope="prototype" />
 
-  <bean id="idAustriaClientAuthCredentialProvider"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthCredentialProvider" />
-
-  <bean id="idAustriaClientAuthMetadataProvider"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataProvider" />
-
-  <bean id="idAustriaClientAuthMetadataController"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthMetadataController" />
-
-  <bean id="idAustriaClientAuthSignalController"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.IdAustriaClientAuthSignalController" />
-
-
-
 
 </beans>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
new file mode 100644
index 00000000..cde9687e
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:context="http://www.springframework.org/schema/context"
+  xmlns:tx="http://www.springframework.org/schema/tx"
+  xmlns:aop="http://www.springframework.org/schema/aop"
+  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+
+  <context:annotation-config />
+
+  <import
+    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
+
+  <bean id="specificConnectorAttributesFile"
+    class="java.lang.String">
+    <constructor-arg value="eidas-attributes.xml" />
+  </bean>
+
+  <bean id="specificAdditionalAttributesFile"
+    class="java.lang.String">
+    <constructor-arg value="additional-attributes.xml" />
+  </bean>
+
+  <bean id="specificConnectorAttributesFileWithPath"
+    class="java.lang.String">
+    <constructor-arg
+      value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
+  </bean>
+
+  <bean id="specificConnectorAdditionalAttributesFileWithPath"
+    class="java.lang.String">
+    <constructor-arg
+      value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
+  </bean>
+
+</beans>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
new file mode 100644
index 00000000..a2437ce6
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
@@ -0,0 +1,15 @@
+module.eidasauth.00=Wrong configuration. Missing property: {0}
+
+module.eidasauth.idaustria.02=eIDAS module has an error in configuration. Reason: {0}
+module.eidasauth.idaustria.05=eIDAS module can not initialize SAML2 metadata provider for entityId: {0}. Reason: {1}
+
+
+module.eidasauth.01=eIDAS module has an error in configuration: {0}. Reason: {1}
+
+module.eidasauth.03=eIDAS module has a general error during request pre-processing. Reason: {0}
+module.eidasauth.04=eIDAS module has a general error during response post-processing.
+module.eidasauth.06=eIDAS module was selected, but eIDAS is NOT enabled for SP: {0}
+
+
+module.eidasauth.98=eIDAS module has an internal error. Reason: {0}
+module.eidasauth.99=eIDAS module has an generic internal error.
-- 
cgit v1.2.3