fix another problem in session database

1 files changed, 26 insertions, 17 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
index 14c0800b1..5b0f5115d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/StatisticLogger.java
@@ -43,7 +43,6 @@ import org.springframework.transaction.annotation.Transactional;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandator;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
-import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.BKUException;
 import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
 import at.gv.egovernment.moa.id.auth.exception.ServiceException;
@@ -51,13 +50,14 @@ import at.gv.egovernment.moa.id.client.SZRGWClientException;
 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.IAuthenticationSession;
+import at.gv.egovernment.moa.id.commons.api.data.IMISMandate;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.id.commons.db.dao.statistic.StatisticLog;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
-import at.gv.egovernment.moa.id.data.MISMandate;
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
 import at.gv.egovernment.moa.id.storage.IAuthenticationSessionStoreage;
 import at.gv.egovernment.moa.logging.Logger;
@@ -149,7 +149,7 @@ public class StatisticLogger implements IStatisticLogger{
 			if (authData.isUseMandate()) {
 				dblog.setMandatelogin(authData.isUseMandate());
 				
-				MISMandate mandate = authData.getMISMandate();
+				IMISMandate mandate = authData.getMISMandate();
 				if (mandate != null) {
 					
 					if (MiscUtil.isNotEmpty(mandate.getProfRep())) {
@@ -254,23 +254,32 @@ public class StatisticLogger implements IStatisticLogger{
 				//dblog.setOaID(dbOA.getHjid());
 				dblog.setBusinessservice(isBusinessService(dbOA));
 				
-				try {
-					AuthenticationSession moasession = authenticatedSessionStorage.
-							getSession(errorRequest.getMOASessionIdentifier());
-					if (moasession != null) {
-						if (MiscUtil.isNotEmpty(moasession.getBkuURL())) {
-							dblog.setBkuurl(moasession.getBkuURL());
-							dblog.setBkutype(findBKUType(moasession.getBkuURL(), dbOA));
-						}
-			
-						dblog.setMandatelogin(moasession.isMandateUsed());
+				IAuthenticationSession moasession = null;
+				if (MiscUtil.isNotEmpty(errorRequest.getInternalSSOSessionIdentifier())) {
+					Logger.debug("Use MOA session information from SSO session for ErrorLogging");
+					try {
+						moasession = authenticatedSessionStorage.getInternalSSOSession(errorRequest.getInternalSSOSessionIdentifier());
+						
+					} catch (MOADatabaseException e) {
+						Logger.error("Error during database communication", e);
+						
 					}
-					
-				} catch (MOADatabaseException e) {
-					Logger.debug(e.getMessage() + " --> StatistikLog will not include MOASession information.");
+										
+				} else {
+					Logger.debug("Use MOA session information from pending-req for ErrorLogging");
+					moasession = errorRequest.getMOASession();
 					
 				}
-
+				
+				if (moasession != null) {
+					if (MiscUtil.isNotEmpty(moasession.getBkuURL())) {
+						dblog.setBkuurl(moasession.getBkuURL());
+						dblog.setBkutype(findBKUType(moasession.getBkuURL(), dbOA));
+					}
+		
+					dblog.setMandatelogin(moasession.isMandateUsed());
+				}
+				
 				generateErrorLogFormThrowable(throwable, dblog);
 				
 				entityManager.persist(dblog);