1 files changed, 19 insertions, 13 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java
index 6bf68e2eb..215a7a809 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/GetForeignIDTask.java
@@ -15,6 +15,8 @@ import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.w3c.dom.Element;
 
+import at.gv.egovernment.moa.id.advancedlogging.MOAIDEventConstants;
+import at.gv.egovernment.moa.id.advancedlogging.MOAReversionLogger;
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
@@ -29,7 +31,9 @@ import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
 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.ModulUtils;
+import at.gv.egovernment.moa.id.moduls.RequestStorage;
 import at.gv.egovernment.moa.id.process.api.ExecutionContext;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
@@ -99,6 +103,11 @@ public class GetForeignIDTask extends AbstractAuthServletTask {
 			pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID);
 			session = AuthenticationServer.getSession(sessionID);
 
+			IRequest pendingReq = RequestStorage.getPendingRequest(
+					(String) executionContext.get("pendingRequestID"));			
+			MOAReversionLogger.getInstance().logEvent(pendingReq.getOnlineApplicationConfiguration(), 
+					pendingReq, MOAIDEventConstants.AUTHPROCESS_BKU_DATAURL_IP, req.getRemoteHost());
+			
 			// change MOASessionID
 			sessionID = AuthenticationSessionStoreage.changeSessionID(session);
 
@@ -118,7 +127,7 @@ public class GetForeignIDTask extends AbstractAuthServletTask {
 				throw new ParseException("parser.04", new Object[] { REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });
 
 			}
-
+			
 			Element signature = csresp.getDsigSignature();
 
 			try {
@@ -128,6 +137,9 @@ public class GetForeignIDTask extends AbstractAuthServletTask {
 				throw new MOAIDException("auth.14", null);
 			}
 
+			MOAReversionLogger.getInstance().logEvent(pendingReq.getOnlineApplicationConfiguration(), 
+					pendingReq, MOAIDEventConstants.AUTHPROCESS_FOREIGN_SZRGW_CONNECTED);
+			
 			// make SZR request to the identity link
 			CreateIdentityLinkResponse response = AuthenticationServer.getInstance().getIdentityLink(signature);
 
@@ -151,24 +163,18 @@ public class GetForeignIDTask extends AbstractAuthServletTask {
 
 				Logger.info("Changed MOASession " + sessionID + " to Session " + newMOASessionID);
 				Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
-
-				redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(),
-						ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingRequestID),
-						newMOASessionID);
-				redirectURL = resp.encodeRedirectURL(redirectURL);
-
-				// TODO[branch]: Final step back to /dispatcher
-
+				
+				MOAReversionLogger.getInstance().logEvent(pendingReq.getOnlineApplicationConfiguration(), 
+						pendingReq, MOAIDEventConstants.AUTHPROCESS_FOREIGN_SZRGW_RECEIVED);
+				
 				try {
 					AuthenticationSessionStoreage.storeSession(session);
 				} catch (MOADatabaseException e) {
 					throw new MOAIDException("Session store error", null);
 				}
 
-				resp.setContentType("text/html");
-				resp.setStatus(302);
-				resp.addHeader("Location", redirectURL);
-				Logger.debug("REDIRECT TO: " + redirectURL);
+				//put session to context 
+				executionContext.put(PARAM_SESSIONID, session.getSessionID());
 			}
 
 		} catch (MOAIDException ex) {