fix problems with reversion log

2 files changed, 25 insertions, 29 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
index aae4dd8c4..9e9fd2bff 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAIDEventConstants.java
@@ -34,11 +34,6 @@ import at.gv.egiz.components.eventlog.api.EventConstants;
  */
 public interface MOAIDEventConstants extends EventConstants {
 
-	//move to EventConstants
-	public static final int TRANSACTION_ERROR = 1103;
-	public static final int SESSION_ERROR = 1003;
-	
-	
 	//auth protocol specific information
 	public static final int AUTHPROTOCOL_TYPE = 3000;
 	
@@ -51,6 +46,7 @@ public interface MOAIDEventConstants extends EventConstants {
 	public static final int AUTHPROTOCOL_OPENIDCONNECT_AUTHREQUEST = 3200;
 	public static final int AUTHPROTOCOL_OPENIDCONNECT_TOKENREQUEST = 3201;
 	
+	public static final int AUTHPROTOCOL_SAML1_AUTHNREQUEST = 3300;
 			
 	//authentication process information
 	public static final int AUTHPROCESS_START = 4000;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
index 1228a95a4..e73aa8df1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
@@ -29,7 +29,6 @@ import java.util.List;
 import com.google.common.primitives.Ints;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
-import at.gv.egiz.components.eventlog.api.EventLoggingException;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.moduls.IRequest;
@@ -78,29 +77,16 @@ public class MOAReversionLogger {
 		
 		return instance;
 	}
-		
-
+			
 	public void logEvent(IOAAuthParameters oaConfig, 
 			int eventCode, String message) {
-		List<Integer> OASpecificEventCodes = null;
-		if (oaConfig == null)
-			OASpecificEventCodes = getDefaulttReversionsLoggingEventCodes();
-		else
-			OASpecificEventCodes = oaConfig.getReversionsLoggingEventCodes();
-		
-		if (OASpecificEventCodes.contains(eventCode))
+		if (selectOASpecificEventCodes(oaConfig).contains(eventCode))
 			MOAIDEventLog.logEvent(MOAIDEventLog.createNewEvent(new Date().getTime(), eventCode, message));		
 	}
 	
 	public void logEvent(IOAAuthParameters oaConfig, IRequest pendingRequest, 
 			int eventCode) {		
-		List<Integer> OASpecificEventCodes = null;
-		if (oaConfig == null)
-			OASpecificEventCodes = getDefaulttReversionsLoggingEventCodes();
-		else
-			OASpecificEventCodes = oaConfig.getReversionsLoggingEventCodes();
-		
-		if (OASpecificEventCodes.contains(eventCode))
+			if (selectOASpecificEventCodes(oaConfig).contains(eventCode))
 			MOAIDEventLog.logEvent(MOAIDEventLog.createNewEvent(new Date().getTime(), eventCode, 
 					pendingRequest.getSessionIdentifier(), 
 					pendingRequest.getRequestID()));
@@ -109,13 +95,7 @@ public class MOAReversionLogger {
 	
 	public void logEvent(IOAAuthParameters oaConfig, IRequest pendingRequest, 
 			int eventCode, String message) {		
-		List<Integer> OASpecificEventCodes = null;
-		if (oaConfig == null)
-			OASpecificEventCodes = getDefaulttReversionsLoggingEventCodes();
-		else
-			OASpecificEventCodes = oaConfig.getReversionsLoggingEventCodes();
-		
-		if (OASpecificEventCodes.contains(eventCode))
+		if (selectOASpecificEventCodes(oaConfig).contains(eventCode))
 			MOAIDEventLog.logEvent(MOAIDEventLog.createNewEvent(new Date().getTime(), eventCode,
 					message,
 					pendingRequest.getSessionIdentifier(), 
@@ -143,6 +123,15 @@ public class MOAReversionLogger {
 	}
 
 	/**
+	 * @param sessionCreated
+	 * @param uniqueSessionIdentifier
+	 */
+	public void logEvent(String sessionID, String transactionID, int eventCode) {
+		MOAIDEventLog.logEvent(MOAIDEventLog.createNewEvent(new Date().getTime(), eventCode, sessionID, transactionID));
+		
+	}
+	
+	/**
 	 * @param errorRequest
 	 * @param transactionError
 	 */
@@ -214,6 +203,17 @@ public class MOAReversionLogger {
 		
 	}
 	
+	private List<Integer> selectOASpecificEventCodes(IOAAuthParameters oaConfig) {
+		List<Integer> OASpecificEventCodes = null;
+		if (oaConfig != null && oaConfig.getReversionsLoggingEventCodes() != null)
+			OASpecificEventCodes = oaConfig.getReversionsLoggingEventCodes();
+			
+		else
+			OASpecificEventCodes = getDefaulttReversionsLoggingEventCodes();
+		
+		return OASpecificEventCodes;
+	}
+	
 	private String buildPersonInformationHash(String givenName, String familyName, String dateofBirth) {
 		
 		// {"hash":"hashvalue","salt":"testSalt"}