From df962dfa24bf11b67c8ffbca0e581ef36613b004 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 10 Mar 2022 17:31:38 +0100
Subject: fix(matching): add missing controller for search-address wizard

---
 .../eidas/v2/controller/AdresssucheController.java | 64 +---------------------
 .../src/main/resources/eidas_v2_auth.beans.xml     |  3 +
 2 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
index 5dc9d3ef..99754662 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/controller/AdresssucheController.java
@@ -29,9 +29,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.jetbrains.annotations.NotNull;
@@ -44,7 +41,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
-import at.asitplus.eidas.specific.core.gui.StaticGuiBuilderConfiguration;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.gv.bmi.namespace.zmr_su.zrm._20040201_.address.Adressdaten;
@@ -54,8 +50,6 @@ import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.utils.IPendingRequestIdGenerationStrategy;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.exceptions.PendingReqIdValidationException;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -91,63 +85,7 @@ public class AdresssucheController {
 
   @Autowired
   private IPendingRequestIdGenerationStrategy pendingReqGeneration;
-
-  /**
-   * Show the "residency.html" directly.
-   * TODO Remove this after testing.
-   */
-  @RequestMapping(value = {"/test"}, method = {RequestMethod.GET})
-  public void test(HttpServletRequest request, HttpServletResponse response) throws GuiBuildException, EaafException {
-    final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-        basicConfig,
-        "http://localhost:8080/ms_connector/",
-        basicConfig.getBasicConfiguration(//TODO
-            MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_RESIDENCY,
-            MsEidasNodeConstants.TEMPLATE_HTML_RESIDENCY),
-        MsEidasNodeConstants.ENDPOINT_RESIDENCY_INPUT,
-        resourceLoader);
-    config.putCustomParameter(null, "pendingid", pendingReqGeneration.generateExternalPendingRequestId());
-    guiBuilder.build(request, response, config, "Query Austrian residency");
-  }
-
-  /**
-   * Show the "other_login_method.html" directly.
-   * TODO Remove this after testing.
-   */
-  @RequestMapping(value = {"/olm"}, method = {RequestMethod.GET})
-  public void otherloginmethod(HttpServletRequest request, HttpServletResponse response) throws GuiBuildException,
-      EaafException {
-    final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-        basicConfig,
-        "http://localhost:8080/ms_connector/",
-        basicConfig.getBasicConfiguration(//TODO
-            MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_OTHER_LOGIN_METHOD_SELECTION,
-            MsEidasNodeConstants.TEMPLATE_HTML_OTHERLOGINMETHODS),
-        MsEidasNodeConstants.ENDPOINT_OTHER_LOGIN_METHOD_SELECTION,
-        resourceLoader);
-    config.putCustomParameter(null, "pendingid", pendingReqGeneration.generateExternalPendingRequestId());
-    guiBuilder.build(request, response, config, "Other Login Method");
-  }
-
-  /**
-   * Show the "country_selection.html" directly.
-   * TODO Remove this after testing.
-   */
-  @RequestMapping(value = {"/country"}, method = {RequestMethod.GET})
-  public void countryselection(HttpServletRequest request, HttpServletResponse response) throws GuiBuildException,
-      EaafException {
-    final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-        basicConfig,
-        "http://localhost:8080/ms_connector/",
-        basicConfig.getBasicConfiguration(//TODO
-            MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_CCSELECTION,
-            MsEidasNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION),
-        MsEidasNodeConstants.ENDPOINT_COUNTRYSELECTION,
-        resourceLoader);
-    config.putCustomParameter(null, "pendingid", pendingReqGeneration.generateExternalPendingRequestId());
-    guiBuilder.build(request, response, config, "Country Selection");
-  }
-
+  
   /**
    * Performs search for addresses in ZMR.
    */
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 40e63a91..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
@@ -96,6 +96,9 @@
   <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="GenerateAuthnRequestTask"
-- 
cgit v1.2.3