1 files changed, 19 insertions, 6 deletions

diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index 775e36f2..34f964fb 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -2,6 +2,8 @@
  *******************************************************************************/
 package at.gv.egiz.eidas.specific.connector.builder;
 
+import java.util.Date;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -20,6 +22,7 @@ import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
 import at.gv.egiz.eaaf.core.impl.idp.auth.builder.AbstractAuthenticationDataBuilder;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 @Service("AuthenticationDataBuilder")
 public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder {
@@ -28,27 +31,37 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 	@Override
 	public IAuthData buildAuthenticationData(IRequest pendingReq) throws EAAFAuthenticationException {
 
-		IAuthProcessDataContainer authProcessData = new AuthProcessDataWrapper(pendingReq.genericFullDataStorage());
+		IAuthProcessDataContainer authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
 		AuthenticationData authData = new AuthenticationData();
 		
 		try {
 			generateBasicAuthData(authData, pendingReq, authProcessData);
 			
+			//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("TODO", new Object[]{},					
-					"Can not build authentication data from auth. process information", e);
+			throw new EAAFAuthenticationException("builder.11", new Object[]{e.getMessage()}, e);
 
 		}
 		 
+		return authData;
 		
-		
-
-		return null;
 	}
 
 	@Override
+	protected Pair<String, String> buildOAspecificbPK(IRequest pendingReq, AuthenticationData authData) throws EAAFBuilderException {
+		//TODO: check if bPK already exists
+		
+		
+		return super.buildOAspecificbPK(pendingReq, authData);
+				
+	}
+	
+	@Override
 	protected Pair<String, String> getEncryptedbPKFromPVPAttribute(IAuthProcessDataContainer arg0,
 			AuthenticationData arg1, ISPConfiguration arg2) throws EAAFBuilderException {
 		return null;