From fa2384985454568439dc286a6a9051fba47322ed Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 25 Jan 2021 16:30:07 +0100
Subject: add ID Austria communication-module and additional jUnit test It's
 first alpha-version of eIDAS MS-specific Proxy-Service with ID Austria
 authentication

---
 .../protocol/EidasProxyServiceController.java      | 59 +++++++++++-----------
 1 file changed, 30 insertions(+), 29 deletions(-)

(limited to 'eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java')

diff --git a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
index 47cfd3a9..aafe57e7 100644
--- a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
+++ b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
@@ -149,6 +149,32 @@ public class EidasProxyServiceController extends AbstractController implements I
     
   }
 
+  @Override
+  public boolean generateErrorMessage(Throwable e, HttpServletRequest request, HttpServletResponse response,
+      IRequest protocolRequest) throws Throwable {
+    
+    //TODO: implement error handling for eIDAS Node communication    
+    return false;
+    
+  }
+  
+  @Override
+  public String getName() {
+    return EidasProxyServiceController.class.getName();
+    
+  }
+
+  @Override
+  public String getAuthProtocolIdentifier() {
+    return PROTOCOL_ID;
+    
+  }
+
+  @Override
+  public boolean validate(HttpServletRequest request, HttpServletResponse response, IRequest pending) {
+    return true;
+    
+  }
   
   /**
    * Validate incoming eIDAS request.
@@ -180,9 +206,12 @@ public class EidasProxyServiceController extends AbstractController implements I
     try {
       String spCountry = eidasRequest.getSpCountryCode();                  
       Map<String, String> spConfigMap = new HashMap<>();
+
+      //TODO: how we get the EntityId from eIDAS connector?
       spConfigMap.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER,
           MessageFormat.format(MsProxyServiceConstants.TEMPLATE_SP_UNIQUE_ID, 
               spCountry, eidasRequest.getSpType()));
+      
       ServiceProviderConfiguration spConfig = new ServiceProviderConfiguration(spConfigMap, authConfig);
     
       final String ccCountry = authConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE,
@@ -198,35 +227,7 @@ public class EidasProxyServiceController extends AbstractController implements I
     } catch (EaafException e) {
       throw new EidasProxyServiceException(ERROR_04, new Object[] {e.getMessage()}, e);
       
-    }
-    
-  }
-
-  @Override
-  public boolean generateErrorMessage(Throwable e, HttpServletRequest request, HttpServletResponse response,
-      IRequest protocolRequest) throws Throwable {
-    
-    //TODO: implement error handling for eIDAS Node communication    
-    return false;
-    
-  }
-  
-  @Override
-  public String getName() {
-    return EidasProxyServiceController.class.getName();
-    
-  }
-
-  @Override
-  public String getAuthProtocolIdentifier() {
-    return PROTOCOL_ID;
-    
-  }
-
-  @Override
-  public boolean validate(HttpServletRequest request, HttpServletResponse response, IRequest pending) {
-    return true;
-    
+    }    
   }
 
 }
-- 
cgit v1.2.3