AuthDataBuilder and AttributeBuilder

1 files changed, 22 insertions, 15 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index b14faa62..51b89120 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -19,7 +19,7 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
-*/
+ */
 
 package at.asitplus.eidas.specific.connector.builder;
 
@@ -54,30 +54,37 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
   public IAuthData buildAuthenticationData(IRequest pendingReq) throws EaafAuthenticationException {
 
     final IAuthProcessDataContainer authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
-    final AuthenticationData authData = new AuthenticationData();
+    AuthenticationData authData = new AuthenticationData();
 
-    try {
-      generateDeprecatedBasicAuthData(authData, pendingReq, authProcessData);
+    String eidMode = pendingReq.getServiceProviderConfiguration()
+        .getConfigurationValue(MsEidasNodeConstants.PROP_CONFIG_SP_EID_MODE, "old");
 
-      // set specific informations
-      authData.setSsoSessionValidTo(new Date(new Date().getTime()
-          + MsEidasNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
+    if (eidMode.equals("new")) {
 
-    } catch (EaafBuilderException | EaafParserException | EaafConfigurationException
-        | XPathException | DOMException e) {
-      log.warn("Can not build authentication data from auth. process information");
-      throw new EaafAuthenticationException("builder.11", new Object[] { e.getMessage() }, e);
+      authData = (AuthenticationData) super.buildAuthenticationData(pendingReq);
 
-    }
+    } else {
+      try {
+        generateDeprecatedBasicAuthData(authData, pendingReq, authProcessData);
 
-    return authData;
+        // set specific informations
+        authData.setSsoSessionValidTo(new Date(new Date().getTime()
+            + MsEidasNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
+
+      } catch (EaafBuilderException | EaafParserException | EaafConfigurationException
+          | XPathException | DOMException e) {
+        log.warn("Can not build authentication data from auth. process information");
+        throw new EaafAuthenticationException("builder.11", new Object[]{e.getMessage()}, e);
 
+      }
+    }
+    return authData;
   }
 
   @Override
   protected IAuthData buildDeprecatedAuthData(IRequest arg0) throws EaafException {
     return new AuthenticationData();
-    
+
   }
 
   @Override
@@ -103,7 +110,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 
   @Override
   protected Pair<String, String> getEncryptedBpkFromPvpAttribute(IAuthProcessDataContainer arg0,
-      AuthenticationData arg1, ISpConfiguration arg2) throws EaafBuilderException {
+                                                                 AuthenticationData arg1, ISpConfiguration arg2) throws EaafBuilderException {
     return null;
 
   }