add AuthBlock to MIS request

2 files changed, 18 insertions, 4 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 c82d1168a..98edf1fe4 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
@@ -238,6 +238,7 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 			        String oaFriendlyName = oaParam.getFriendlyName();
 			        String mandateReferenceValue = session.getMandateReferenceValue();
 			        byte[] cert = session.getEncodedSignerCertificate();
+			        byte[] authBlock = session.getAuthBlock().getBytes();
 			        
 			        //TODO: check in case of SSO!!!
 			        String targetType = null;  
@@ -252,7 +253,17 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 			        	targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget();
 			        }
 			        
-			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert, oaFriendlyName, redirectURL, mandateReferenceValue, profiles, targetType, sslFactory);
+			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(
+			        		connectionParameters.getUrl(), 
+			        		idl, 
+			        		cert, 
+			        		oaFriendlyName, 
+			        		redirectURL, 
+			        		mandateReferenceValue, 
+			        		profiles, 
+			        		targetType,
+			        		authBlock,
+			        		sslFactory);
 			        
 			        if (misSessionID == null) {
 			      	  Logger.error("Fehler bei Anfrage an Vollmachten Service. MIS Session ID ist null.");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
index 3025e626f..aaf793987 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -157,7 +157,7 @@ public class MISSimpleClient {
 		} 

 	}

 	

-	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, List<String> mandateIdentifier, String targetType, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

+	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, List<String> mandateIdentifier, String targetType, byte[] authBlock, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

 		if (webServiceURL == null) {

 			throw new MISSimpleClientException("service.04");

 		}

@@ -224,8 +224,11 @@ public class MISSimpleClient {
 			targetElement.appendChild(targetTypeElement);

 			mirElement.appendChild(targetElement);

 			

-

-			

+			//add AuthBlock element

+			Element authBlockElement = doc.createElementNS(MIS_NS, "authBlock");

+			authBlockElement.appendChild(doc.createTextNode(new String(Base64.encodeBase64(authBlock))));

+			mirElement.appendChild(authBlockElement);

+						

 			// send soap request

 			Element mandateIssueResponseElement = sendSOAPRequest(webServiceURL, mirElement);