1 files changed, 14 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index 44453afe3..a8cf5014f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1466,7 +1466,6 @@ public class AuthenticationServer implements MOAIDAuthConstants {
      */
     public static AuthenticationSession getSession(String id)
             throws AuthenticationException {
-
         AuthenticationSession session;
         try {
             session = AuthenticationSessionStoreage.getSession(id);
@@ -1476,7 +1475,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
             return session;
 
         } catch (MOADatabaseException e) {
-            throw new AuthenticationException("parser.04", new Object[]{id});
+        	throw new AuthenticationException("auth.02", new Object[]{id});
+            
+        } catch (Exception e) {
+        	throw new AuthenticationException("parser.04", new Object[]{id});
         }
     }
 
@@ -1755,8 +1757,12 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
        
         String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
-        String acsURL = new DataURLBuilder().buildDataURL(issuerValue, 
-    			PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN, moasession.getSessionID());
+//        String acsURL = new DataURLBuilder().buildDataURL(issuerValue, 
+//    			PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN, moasession.getSessionID());
+        
+        //solve Problem with sessionIDs 
+        String acsURL = issuerValue + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN;
+        
         Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL);
 
         String providerName = oaParam.getFriendlyName();
@@ -1860,10 +1866,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
         //send
         moasession.setStorkAuthnRequest(authnRequest);
-        HttpSession httpSession = req.getSession();
-        httpSession.setAttribute("MOA-Session-ID", moasession.getSessionID());
-
 
+        AuthenticationSessionStoreage.changeSessionID(moasession, authnRequest.getSamlId());
+        
+        
         Logger.info("Preparing to send STORK AuthnRequest.");
         Logger.info("prepared STORKAuthnRequest: ");
         Logger.info(new String(authnRequest.getTokenSaml()));
@@ -1886,8 +1892,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
         } catch (Exception e) {
             Logger.error("Error sending STORK SAML AuthnRequest.", e);
-            httpSession.invalidate();
             throw new MOAIDException("stork.02", new Object[]{destination});
+            
         }
 
         Logger.info("STORK AuthnRequest successfully successfully prepared for client with target location: " + authnRequest.getDestination());