1 files changed, 45 insertions, 66 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
index c9f9491bb..181c46bf9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
@@ -150,7 +150,9 @@ public class VerifyCertificateServlet extends AuthServlet {
     			throw new AuthenticationException("auth.14", null);    		
     		}
     		
-	    	boolean useMandate = session.getUseMandate();
+	    	boolean useMandate = session.getUseMandate();
+	    	
+	    	
 	    	if (useMandate) {
 	    		// Mandate Modus	    	
 	    		// make request to MIS
@@ -162,8 +164,6 @@ public class VerifyCertificateServlet extends AuthServlet {
     			// get identitity link as byte[]
     			Element elem = session.getIdentityLink().getSamlAssertion();
     			String s = DOMUtils.serializeNode(elem);
-//    			byte[] idl = DOMUtils.nodeToByteArray(elem);
-//    			String s = new String(idl);
     			byte[] idl = s.getBytes();
     			
     			// redirect url
@@ -187,8 +187,10 @@ public class VerifyCertificateServlet extends AuthServlet {
     	          for(int i = 0; i < profilesArray.length; i++) {
     	        	  profilesArray[i] = profilesArray[i].trim();
     	          }
-    	          
-    	          MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert.getEncoded(), redirectURL, profilesArray, sslFactory);
+    	          
+    	          String oaFriendlyName = oaParam.getFriendlyName();
+    	          String mandateReferenceValue = session.getMandateReferenceValue();
+    	          MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert.getEncoded(), oaFriendlyName, redirectURL, mandateReferenceValue, profilesArray, sslFactory);
     	          String redirectMISGUI = misSessionID.getRedirectURL();
     	          
     	          if (misSessionID == null) {
@@ -236,21 +238,6 @@ public class VerifyCertificateServlet extends AuthServlet {
   }
     
   /**
-   * Adds a parameter to a URL.
-   * @param url the URL
-   * @param paramname parameter name
-   * @param paramvalue parameter value
-   * @return the URL with parameter added
-   */
-  private static String addURLParameter(String url, String paramname, String paramvalue) {
-		String param = paramname + "=" + paramvalue;
-  	if (url.indexOf("?") < 0)
-	  	return url + "?" + param;
-  	else
-  		return url + "&" + param;
-  }
-  
-  /**
    * Does the request to the SZR-GW
    * @param givenname
    * @param familyname
@@ -312,50 +299,42 @@ public class VerifyCertificateServlet extends AuthServlet {
 //	
 //  }
   
-  /**
-   * Builds the szrgw:GetIdentityLinkRequest für the SZR-GW
-   * @param givenname
-   * @param familyname
-   * @param birthday
-   * @return
-   */
-  private static Document buildGetIdentityLinkRequest(X509Certificate cert) {
-	  
-	  try {
-		  	byte[] certbyte = cert.getEncoded();
-		  	String certstring = Base64.encode(certbyte); 
-	      
-			DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();
-			factory.setNamespaceAware(true);
-	        DocumentBuilder builder = factory.newDocumentBuilder();
-	        Document doc = builder.newDocument();
-	        
-	        Element getIdentityLink = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:GetIdentityLinkRequest");
-	        getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGWConstants.SZRGW_REQUEST_NS);
-	        doc.appendChild(getIdentityLink);
-	        
-	        Element x509certificate = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:X509Certificate");
-	        getIdentityLink.appendChild(x509certificate);
-	        Text certbase64 = doc.createTextNode(certstring);
-	        x509certificate.appendChild(certbase64);
-	                          
-	        return doc;
-	    } catch (ParserConfigurationException e) {
-	    	e.printStackTrace();
-	    } catch (CertificateEncodingException e) {
-			e.printStackTrace();
-		}
-	    return null;
-	
-	}
-  
-    /**
-   * Checks a parameter.
-   * @param param parameter
-   * @return true if the parameter is null or empty
-   */
-  private boolean isEmpty(String param) {
-    return param == null || param.length() == 0;
-  }
- 
+//  /**
+//   * Builds the szrgw:GetIdentityLinkRequest für the SZR-GW
+//   * @param givenname
+//   * @param familyname
+//   * @param birthday
+//   * @return
+//   */
+//  private static Document buildGetIdentityLinkRequest(X509Certificate cert) {
+//	  
+//	  try {
+//		  	byte[] certbyte = cert.getEncoded();
+//		  	String certstring = Base64.encode(certbyte); 
+//	      
+//			DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();
+//			factory.setNamespaceAware(true);
+//	        DocumentBuilder builder = factory.newDocumentBuilder();
+//	        Document doc = builder.newDocument();
+//	        
+//	        Element getIdentityLink = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:GetIdentityLinkRequest");
+//	        getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGWConstants.SZRGW_REQUEST_NS);
+//	        doc.appendChild(getIdentityLink);
+//	        
+//	        Element x509certificate = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:X509Certificate");
+//	        getIdentityLink.appendChild(x509certificate);
+//	        Text certbase64 = doc.createTextNode(certstring);
+//	        x509certificate.appendChild(certbase64);
+//	                          
+//	        return doc;
+//	    } catch (ParserConfigurationException e) {
+//	    	e.printStackTrace();
+//	    } catch (CertificateEncodingException e) {
+//			e.printStackTrace();
+//		}
+//	    return null;
+//	
+//	}
+//  
+     
 }