1 files changed, 5 insertions, 27 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
index 1b78ff677..ec6dbc951 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/AbstractAuthServletTask.java
@@ -22,18 +22,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
 import at.gv.egovernment.moa.id.commons.api.IRequest;
+import at.gv.egovernment.moa.id.commons.api.data.IAuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.moduls.IRequestStorage;
 import at.gv.egovernment.moa.id.process.api.ExecutionContext;
 import at.gv.egovernment.moa.id.process.springweb.MoaIdTask;
 import at.gv.egovernment.moa.id.protocols.AbstractAuthProtocolModulController;
-import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.MiscUtil;
 
 /**
  * Task based counterpart to {@link AuthServlet}, providing the same utility methods (error handling, parameter parsing
@@ -42,14 +40,14 @@ import at.gv.egovernment.moa.util.MiscUtil;
 public abstract class AbstractAuthServletTask extends MoaIdTask {
 
 	@Autowired protected IRequestStorage requestStoreage;
-	@Autowired protected IAuthenticationSessionStoreage authenticatedSessionStorage;
+	//@Autowired protected IAuthenticationSessionStoreage authenticatedSessionStorage;
 	@Autowired protected MOAReversionLogger revisionsLogger;
 	@Autowired protected AuthConfiguration authConfig;
 	
 	protected static final String ERROR_CODE_PARAM = "errorid";
 
 	protected IRequest pendingReq = null;
-	protected AuthenticationSession moasession = null;
+	protected IAuthenticationSession moasession = null;
 	
 	public abstract void execute(ExecutionContext executionContext, HttpServletRequest request,
 			HttpServletResponse response) throws TaskExecutionException;
@@ -77,28 +75,8 @@ public abstract class AbstractAuthServletTask extends MoaIdTask {
 	 * @throws MOADatabaseException
 	 */
 	protected void defaultTaskInitialization(HttpServletRequest req, ExecutionContext executionContext) throws MOAIDException, MOADatabaseException {								
-		String moasessionid = pendingReq.getMOASessionIdentifier();			
-		if (MiscUtil.isEmpty(moasessionid)) {
-			Logger.warn("MOASessionID is empty.");
-			throw new MOAIDException("auth.18", new Object[] {});
-		}
-		
-		try {			
-			moasession  = authenticatedSessionStorage.getSession(moasessionid);
-		
-			if (moasession == null) {
-				Logger.warn("MOASessionID is empty.");
-				throw new MOAIDException("auth.18", new Object[] {});
-			}
-			
-		} catch (MOADatabaseException e) {
-			Logger.info("MOASession with SessionID=" + moasessionid + " is not found in Database");
-			throw new MOAIDException("init.04", new Object[] { moasessionid });
-
-		} catch (Throwable e) {
-			Logger.info("No HTTP Session found!");
-			throw new MOAIDException("auth.18", new Object[] {});
-		}
+		Logger.trace("Get MOASessionData object from pendingReq:" + pendingReq.getRequestID());
+		moasession = pendingReq.getMOASession();
 		
 	}