Merge branch 'nightlybuild_matching' into 'nightlybuild'

eIDAS matching functionality

See merge request egiz/eidas_at_proxy!18

1 files changed, 90 insertions, 28 deletions

diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 3b0cee54..193513b0 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -11,33 +11,23 @@
 
   <context:annotation-config />
 
-  <import
-    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
+  <bean id="appVersionHolder"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.VersionHolder" />
 
-  <bean id="SZRClientForeIDAS"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient" />
-
-  <bean id="specificConnectorAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="eidas-attributes.xml" />
-  </bean>
+  <bean id="eidasConnectorMessageSource"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.config.EidasConnectorMessageSource"/>
 
-  <bean id="specificAdditionalAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="additional-attributes.xml" />
-  </bean>
+  <bean id="SZRClientForeIDAS"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr.SzrClient" />
 
-  <bean id="specificConnectorAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
-  </bean>
+  <bean id="zmrClient"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient" />
+        
+  <bean id="zmrAddressClient"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient" />
 
-  <bean id="specificConnectorAdditionalAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
-  </bean>
+  <bean id="ernpClient"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.ernp.ErnpRestClient" />
 
   <bean id="eIDASAuthModule"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationModulImpl">
@@ -55,7 +45,7 @@
       ref="specificConnectorAdditionalAttributesFileWithPath" />
   </bean>
 
-  <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" 
+  <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore"
     /> -->
 
   <bean id="authBlockSigningService"
@@ -79,17 +69,89 @@
     <property name="priority" value="0" />
   </bean>
 
+  <bean id="deSpecificDetailSearchProcessor"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.DeSpecificDetailSearchProcessor">
+  </bean>
+
+  <bean id="itSpecificDetailSearchProcessor"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.ItSpecificDetailSearchProcessor">
+  </bean>
+
+  <bean id="registerSearchService"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.RegisterSearchService" />
+
+  <!-- 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" />
+
+  <bean id="addressWizardController"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.controller.AdresssucheController" />
+
+
   <!-- Authentication Process Tasks -->
-  <bean id="ConnecteIDASNodeTask"
+  <bean id="GenerateAuthnRequestTask"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask"
     scope="prototype" />
 
-  <bean id="ReceiveResponseFromeIDASNodeTask"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
-    scope="prototype" />
+  <bean id="ReceiveAuthnResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
+        scope="prototype" />
+
+  <bean id="ReceiveAuthnResponseAlternativeTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseAlternativeTask"
+        scope="prototype" />
 
   <bean id="CreateIdentityLinkTask"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask"
     scope="prototype" />
 
+  <bean id="InitialSearchTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask"
+        scope="prototype" />
+
+  <bean id="AlternativeSearchTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.AlternativeSearchTask"
+        scope="prototype" />
+
+  <bean id="CreateNewErnpEntryTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask"
+        scope="prototype" />
+
+  <bean id="GenerateOtherLoginMethodGuiTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask"
+        scope="prototype" />
+
+  <bean id="GenerateMobilePhoneSignatureRequestTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateMobilePhoneSignatureRequestTask"
+        scope="prototype" />
+
+  <bean id="ReceiveOtherLoginMethodGuiResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveOtherLoginMethodGuiResponseTask"
+        scope="prototype" />
+
+  <bean id="ReceiveMobilePhoneSignatureResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveMobilePhoneSignatureResponseTask"
+        scope="prototype" />
+
+  <bean id="GenerateAustrianResidenceGuiTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAustrianResidenceGuiTask"
+        scope="prototype" />
+
+  <bean id="ReceiveAustrianResidenceGuiResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAustrianResidenceGuiResponseTask"
+        scope="prototype" />
+
+
 </beans>
\ No newline at end of file