fix another problem in session database

2 files changed, 9 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index 5e09380ae..a146f778e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -134,16 +134,14 @@ public class IDPSingleLogOutServlet extends AbstractController {
 			try {
 				if (ssoManager.isValidSSOSession(ssoid, null)) {
 				
-					String moaSessionID = authenicationStorage.getMOASessionSSOID(ssoid);
-
-					if (MiscUtil.isNotEmpty(moaSessionID)) {					
-						AuthenticationSession authSession = authenicationStorage.getSession(moaSessionID);
-						if(authSession != null) {
-							authManager.performSingleLogOut(req, resp, authSession, authURL);
-							return;
+					AuthenticationSession authSession = authenicationStorage.getInternalMOASessionWithSSOID(ssoid);
+					
+					if(authSession != null) {
+						authManager.performSingleLogOut(req, resp, authSession, authURL);
+						return;
 							
-						}
 					}
+
 				}
 			} catch (Exception e) {
 				handleErrorNoRedirect(e, req, resp, false);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
index 15333a933..8ef047300 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
@@ -56,6 +56,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.moduls.AuthenticationManager;
@@ -105,8 +106,8 @@ public class LogOutServlet {
 				//TODO: Single LogOut Implementation
 		
 				//delete SSO session and MOA session
-				String moasessionid = authenticatedSessionStorage.getMOASessionSSOID(ssoid);
-				authmanager.performOnlyIDPLogOut(req, resp, moasessionid);
+				AuthenticationSession moasessionid = authenticatedSessionStorage.getInternalMOASessionWithSSOID(ssoid);
+				authmanager.performOnlyIDPLogOut(moasessionid);
 				
 				Logger.info("User with SSO Id " + ssoid + " is logged out and get redirect to "+ redirectUrl);
 			} else {