1 files changed, 10 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java
index ed309d85a..4fd43b6ba 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java
@@ -29,15 +29,13 @@ import org.springframework.stereotype.Service;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask;
 import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
-import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
 import at.gv.egovernment.moa.id.process.api.ExecutionContext;
-import at.gv.egovernment.moa.id.protocols.AbstractProtocolModulController;
+import at.gv.egovernment.moa.id.protocols.AbstractAuthProtocolModulController;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
@@ -57,7 +55,7 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask {
 			throws TaskExecutionException {
 		
 		try {
-			IRequest pendingReq = requestStoreage.getPendingRequest(
+			pendingReq = requestStoreage.getPendingRequest(
 					(String) executionContext.get(MOAIDAuthConstants.PARAM_TARGET_PENDINGREQUESTID));	
 		
 			if (pendingReq == null) {
@@ -67,16 +65,15 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask {
 			}
 			
 			//get Session from context
-			String moasessionid = pendingReq.getMOASessionIdentifier();
-			AuthenticationSession session = null;				
+			String moasessionid = pendingReq.getMOASessionIdentifier();			
 			if (MiscUtil.isEmpty(moasessionid)) {
 				Logger.warn("MOASessionID is empty.");
 				throw new MOAIDException("auth.18", new Object[] {});
 			}
 			
 			try {			
-				session = authenticatedSessionStorage.getSession(moasessionid);
-				if (session == null) {
+				moasession = authenticatedSessionStorage.getSession(moasessionid);
+				if (moasession == null) {
 					Logger.info("MOASession with SessionID=" + moasessionid + " is not found in Database");
 					throw new MOAIDException("init.04", new Object[] { moasessionid });
 					
@@ -98,8 +95,8 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask {
 		
 
 			//set MOASession to authenticated and store MOASession
-			session.setAuthenticated(true);
-			String newMOASessionID = authenticatedSessionStorage.changeSessionID(session);
+			moasession.setAuthenticated(true);
+			String newMOASessionID = authenticatedSessionStorage.changeSessionID(moasession);
 
 			//set pendingRequest to authenticated and set new MOASessionID			
 			((RequestImpl)pendingReq).setMOASessionIdentifier(newMOASessionID);
@@ -109,7 +106,7 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask {
 			Logger.info("AuthProcess finished. Redirect to Protocol Dispatcher.");
 			
 			String redirectURL = new DataURLBuilder().buildDataURL(pendingReq.getAuthURL(), 
-					AbstractProtocolModulController.FINALIZEPROTOCOL_ENDPOINT, pendingReq.getRequestID());
+					AbstractAuthProtocolModulController.FINALIZEPROTOCOL_ENDPOINT, pendingReq.getRequestID());
 							
 			response.setContentType("text/html");
 			response.setStatus(302);
@@ -117,11 +114,11 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask {
 			Logger.debug("REDIRECT TO: " + redirectURL);
 			
 		} catch (MOAIDException e) {
-			throw new TaskExecutionException(e.getMessage(), e);
+			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
 			
 		} catch (Exception e) {
 			Logger.warn("FinalizeAuthenticationTask has an internal error", e);
-			throw new TaskExecutionException(e.getMessage(), e);
+			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
 			
 		}