created tasks and beans

7 files changed, 46 insertions, 66 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnbEntryTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
index 77d6ed41..6f7304c9 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnbEntryTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2021 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -35,23 +35,12 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Task that searches ErnB and ZMR before adding person to SZR.
  *
- * @author tlenz
+ * @author amarsalek
  */
 @Slf4j
 @Component("CreateNewErnbEntryTask")
-// NOTE: General: Please rebase git commit and squash them where useful, i.e. "remove unused import" should
-//       not be a separate commit.
-public class CreateNewErnbEntryTask extends AbstractAuthServletTask {
+public class CreateNewErnpEntryTask extends AbstractAuthServletTask {
 
-
-  /*
-   * (non-Javadoc)
-   *
-   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
-   * egovernment.moa.id.process.api.ExecutionContext,
-   * javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)
-   */
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateGuiTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateGuiTask.java
index d55d4a7e..3d77f994 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateGuiTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateGuiTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2021 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -41,12 +41,10 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Task that searches ErnB and ZMR before adding person to SZR.
  *
- * @author tlenz
+ * @author amarsalek
  */
 @Slf4j
 @Component("GenerateGuiTask")
-// NOTE: General: Please rebase git commit and squash them where useful, i.e. "remove unused import" should
-//       not be a separate commit.
 public class GenerateGuiTask extends AbstractAuthServletTask {
 
   @Autowired
@@ -54,14 +52,6 @@ public class GenerateGuiTask extends AbstractAuthServletTask {
   @Autowired
   IConfiguration basicConfig;
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
-   * egovernment.moa.id.process.api.ExecutionContext,
-   * javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)
-   */
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java
index c9974509..7c154705 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateMobilePhoneSignatureRequestTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2021 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -35,23 +35,13 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Task that searches ErnB and ZMR before adding person to SZR.
  *
- * @author tlenz
+ * @author amarsalek
  */
 @Slf4j
 @Component("GenerateMobilePhoneSignatureRequestTask")
-// NOTE: General: Please rebase git commit and squash them where useful, i.e. "remove unused import" should
-//       not be a separate commit.
 public class GenerateMobilePhoneSignatureRequestTask extends AbstractAuthServletTask {
 
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
-   * egovernment.moa.id.process.api.ExecutionContext,
-   * javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)
-   */
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveGuiResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveGuiResponseTask.java
index b0cb857e..fc51ce2d 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveGuiResponseTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveGuiResponseTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2021 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -40,24 +40,14 @@ import java.util.Enumeration;
 /**
  * Task that searches ErnB and ZMR before adding person to SZR.
  *
- * @author tlenz
+ * @author amarsalek
  */
 @Slf4j
 @Component("ReceiveGuiResponseTask")
-// NOTE: General: Please rebase git commit and squash them where useful, i.e. "remove unused import" should
-//       not be a separate commit.
 public class ReceiveGuiResponseTask extends AbstractAuthServletTask {
 
-  final String LOGIN_METHOD = "loginSelection";
+  final String loginMethod = "loginSelection";
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
-   * egovernment.moa.id.process.api.ExecutionContext,
-   * javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)
-   */
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
@@ -68,10 +58,10 @@ public class ReceiveGuiResponseTask extends AbstractAuthServletTask {
         final String paramName = reqParamNames.nextElement();
         if (StringUtils.isNotEmpty(paramName)
             && !EaafConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
-          if (LOGIN_METHOD.equalsIgnoreCase(paramName)) {
+          if (loginMethod.equalsIgnoreCase(paramName)) {
             String value = StringEscapeUtils.escapeHtml(request.getParameter(paramName));
             SelectedLoginMethod selection = SelectedLoginMethod.valueOf(value);
-            executionContext.put(LOGIN_METHOD, selection);
+            executionContext.put(loginMethod, selection);
           }
         }
       }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java
index 28c351f2..95eeca4c 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 A-SIT Plus GmbH
+ * Copyright 2021 A-SIT Plus GmbH
  * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
@@ -35,23 +35,12 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Task that searches ErnB and ZMR before adding person to SZR.
  *
- * @author tlenz
+ * @author amarsalek
  */
 @Slf4j
 @Component("ReceiveMobilePhoneSignatureResponseTask")
-// NOTE: General: Please rebase git commit and squash them where useful, i.e. "remove unused import" should
-//       not be a separate commit.
 public class ReceiveMobilePhoneSignatureResponseTask extends AbstractAuthServletTask {
 
-
-  /*
-   * (non-Javadoc)
-   *
-   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
-   * egovernment.moa.id.process.api.ExecutionContext,
-   * javax.servlet.http.HttpServletRequest,
-   * javax.servlet.http.HttpServletResponse)
-   */
   @Override
   public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
       throws TaskExecutionException {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
index e199d379..5134982a 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
@@ -13,6 +13,18 @@
   <pd:Task id="initialRegisterSearch"
            class="InitialSearchTask" />
 
+  <pd:Task id="CreateNewErnpEntryTask"
+           class="CreateNewErnpEntryTask" />
+  <pd:Task id="GenerateGuiTask"
+           class="GenerateGuiTask" />
+  <pd:Task id="GenerateMobilePhoneSignatureRequestTask"
+           class="GenerateMobilePhoneSignatureRequestTask" />
+  <pd:Task id="ReceiveGuiResponseTask"
+           class="ReceiveGuiResponseTask" />
+  <pd:Task id="ReceiveMobilePhoneSignatureResponseTask"
+           class="ReceiveMobilePhoneSignatureResponseTask" />
+
+
   <pd:StartEvent id="start" />
   
   <pd:Transition  from="start" 
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 ca6eba20..06269bfc 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
@@ -105,4 +105,24 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask"
         scope="prototype" />
 
+  <bean id="CreateNewErnpEntryTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask"
+        scope="prototype" />
+
+  <bean id="GenerateGuiTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateGuiTask"
+        scope="prototype" />
+
+  <bean id="GenerateMobilePhoneSignatureRequestTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateMobilePhoneSignatureRequestTask"
+        scope="prototype" />
+
+  <bean id="ReceiveGuiResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveGuiResponseTask"
+        scope="prototype" />
+
+  <bean id="ReceiveMobilePhoneSignatureResponseTask"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveMobilePhoneSignatureResponseTask"
+        scope="prototype" />
+
 </beans>
\ No newline at end of file