1 files changed, 11 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
index 4f722c8b3..2b46c8ff2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
@@ -50,6 +50,7 @@ import iaik.pki.PKIException;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.List;
 import java.util.Map;
 
 import javax.net.ssl.SSLSocketFactory;
@@ -174,9 +175,8 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 
 		// escape parameter strings
 		sessionID = StringEscapeUtils.escapeHtml(sessionID);
-
 		pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID);
-		
+	   		
 		String redirectURL = null;
 		try {
          // check parameter
@@ -187,6 +187,9 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 
 			AuthenticationSession session = AuthenticationServer.getSession(sessionID);
 
+			//change MOASessionID
+		    sessionID = AuthenticationSessionStoreage.changeSessionID(session);
+			
 			String samlArtifactBase64 = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse);
 			
 
@@ -220,17 +223,17 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 					
 			        String oaURL = session.getOAURLRequested();
 			        OAAuthParameter oaParam = authConf.getOnlineApplicationParameter(oaURL);
-			        String profiles = oaParam.getMandateProfiles();
+			        List<String> profiles = oaParam.getMandateProfiles();
 
 			        if (profiles == null) {
 			      	  Logger.error("No Mandate/Profile for OA configured.");
 			      	  throw new AuthenticationException("auth.16", new Object[] { GET_MIS_SESSIONID});
 			        }
 			        
-			        String profilesArray[] = profiles.split(",");  	 		 
-			        for(int i = 0; i < profilesArray.length; i++) {
-			      	  profilesArray[i] = profilesArray[i].trim();
-			        }
+//			        String profilesArray[] = profiles.split(",");  	 		 
+//			        for(int i = 0; i < profilesArray.length; i++) {
+//			      	  profilesArray[i] = profilesArray[i].trim();
+//			        }
 			        
 			        String oaFriendlyName = oaParam.getFriendlyName();
 			        String mandateReferenceValue = session.getMandateReferenceValue();
@@ -249,7 +252,7 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 			        	targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget();
 			        }
 			        
-			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert, oaFriendlyName, redirectURL, mandateReferenceValue, profilesArray, targetType, sslFactory);
+			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert, oaFriendlyName, redirectURL, mandateReferenceValue, profiles, targetType, sslFactory);
 			        
 			        if (misSessionID == null) {
 			      	  Logger.error("Fehler bei Anfrage an Vollmachten Service. MIS Session ID ist null.");