1 files changed, 41 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
index ffc6012c9..b612352c6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestImpl.java
@@ -26,6 +26,7 @@ import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,10 +36,14 @@ import javax.servlet.http.HttpServletRequest;
 import org.opensaml.saml2.metadata.provider.MetadataProvider;
 
 import at.gv.egovernment.moa.id.advancedlogging.TransactionIDUtils;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSessionWrapper;
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.IRequest;
+import at.gv.egovernment.moa.id.commons.api.data.AuthProzessDataConstants;
+import at.gv.egovernment.moa.id.commons.api.data.IAuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.commons.api.exceptions.SessionDataStorageException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
@@ -67,8 +72,8 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	private String action = null;
 	
 	private String requestID;
-	private String moaSessionIdentifier;
 	private String processInstanceId;
+	private String ssoMoaSessionId;
 	
 	private String uniqueTransactionIdentifer;
 	private String uniqueSessionIdentifer;
@@ -91,6 +96,8 @@ public abstract class RequestImpl implements IRequest, Serializable{
 		
 	private Map<String, Object> genericDataStorage = new HashMap<String, Object>();
 	
+	private IAuthenticationSession moaSSOSessionContainer = null;
+	
 	 	
 	/**
 	 * @throws ConfigurationException 
@@ -99,11 +106,14 @@ public abstract class RequestImpl implements IRequest, Serializable{
 	public final void initialize(HttpServletRequest req) throws ConfigurationException {				
 		//set requestID
 		requestID = Random.nextLongRandom();
-		
+				
 		//set unique transaction identifier for logging
 		uniqueTransactionIdentifer = Random.nextLongRandom();		
 		TransactionIDUtils.setTransactionId(uniqueTransactionIdentifer);
 		
+		//initialize session object
+		genericDataStorage.put(AuthProzessDataConstants.VALUE_CREATED, new Date());
+		genericDataStorage.put(AuthProzessDataConstants.VALUE_SESSIONID, Random.nextLongRandom());
 		
 		//check if End-Point is valid		
 		String authURLString = HTTPUtils.extractAuthURLFromRequest(req);
@@ -247,16 +257,41 @@ public abstract class RequestImpl implements IRequest, Serializable{
 		return requestID;
 	}
 	
-	public String getMOASessionIdentifier() {
-		return this.moaSessionIdentifier;
+	public String getInternalSSOSessionIdentifier() {
+		return this.ssoMoaSessionId;
+	}
+	
+	/**
+	 * Set the internal SSO session identifier, which associated with this pending request
+	 * 
+	 * @param internalSSOSessionId 
+	 */
+	public void setInternalSSOSessionIdentifier(String internalSSOSessionId) {
+		this.ssoMoaSessionId = internalSSOSessionId;
 		
 	}
 	
-	public void setMOASessionIdentifier(String moaSessionIdentifier) {
-		this.moaSessionIdentifier = moaSessionIdentifier;
+	public IAuthenticationSession getMOASession() {
+		//if SSO session information are set, use this
+		if (moaSSOSessionContainer != null)
+			return moaSSOSessionContainer;
 		
+		else
+			return new AuthenticationSessionWrapper(genericDataStorage);
+				
 	}
 	
+	public void populateMOASessionWithSSOInformation(IAuthenticationSession ssoSession) {
+		if (ssoSession instanceof AuthenticationSession) {
+			moaSSOSessionContainer = ssoSession;
+						
+		} else 
+			throw new IllegalStateException("Session information can only be populated with SSO information from database");
+		
+		
+	}
+	
+	
 	public IOAAuthParameters getOnlineApplicationConfiguration() {
 		return this.OAConfiguration;