Update Integration TSL Library

Update MOA-SP documentation
Update repository (for TSL integration)
Update MOA-ID (Organwalter bPK from MIS)

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1302 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 42 insertions, 12 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 2964f8a88..a2c1d6131 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
@@ -1872,6 +1872,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 				identificationType = ParepUtils.getIdentification(mandator,
 						"Type");
 				identificationValue = ParepUtils.extractMandatorWbpk(mandator);
+				
 				prPerson = ParepUtils.extractPrPersonOfMandate(mandate);
 				if (physical
 						&& session.getBusinessService()
@@ -1911,14 +1912,15 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 																		// vsresp,
 																		// replacementIdentityLink);
 
+				
 		Element mandatePerson = tempIdentityLink.getPrPerson();
-		// try {
-		// System.out.println("MANDATE: " +
-		// DOMUtils.serializeNode(mandatePerson));
-		// }
-		// catch(Exception e) {
-		// e.printStackTrace();
-		// }
+//		 try {
+//		 System.out.println("MANDATE: " +
+//		 DOMUtils.serializeNode(mandatePerson));
+//		 }
+//		 catch(Exception e) {
+//		 e.printStackTrace();
+//		 }
 		String mandateData = null;
 		boolean useCondition = false;
 		int conditionLength = -1;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
index 74b2f80b9..a1b03fcad 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
@@ -35,6 +35,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.w3c.dom.Element;
@@ -44,6 +45,7 @@ import at.gv.egovernment.moa.id.MOAIDException;
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.WrongParametersException;
+import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
@@ -158,7 +160,8 @@ public class GetMISSessionIDServlet extends AuthServlet {
 	    	}

 	    	

 	    	// for now: list contains only one element

-	    	MISMandate mandate = (MISMandate)list.get(0);	    	

+	    	MISMandate mandate = (MISMandate)list.get(0);	   
+	    	

 	    	

 	    	// verify mandate signature

 	    	AuthenticationServer.getInstance().verifyMandate(sessionID, mandate);

@@ -166,7 +169,9 @@ public class GetMISSessionIDServlet extends AuthServlet {
 	    	byte[] byteMandate = mandate.getMandate();
 	    	String stringMandate = new String(byteMandate);
 	    	Element mandateDoc = DOMUtils.parseDocument(stringMandate, false, null, null).getDocumentElement();
-	    	//session.setMandateElem(mandateDoc.getDocumentElement());
+
+	    	//TODO OW bPK (Offen: was bei saml:NameIdentifier NameQualifier="urn:publicid:gv.at:cdid+bpk"> und <saml:Attribute AttributeName="bPK" )
+	    	//System.out.println("\n\n\n OW BPK: " + mandate.getOWbPK());
 	    	
 	    	String redirectURL = null;
 	    	String samlArtifactBase64 = 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
index 6ca059911..80f2d744c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
@@ -41,13 +41,21 @@ public class MISMandate {
 	

 	private String oid = null;

 	private byte[] mandate = null;

+	private String owBPK = null;
 	

 	public String getProfRep() {

   	return oid;

   }

 	public void setProfRep(String oid) {

   	this.oid = oid;

-  }

+  }
+	public void setOWbPK(String oWbPK) {
+		this.owBPK = oWbPK;
+	}
+	
+	public String getOWbPK() {
+		return owBPK;
+	}

 	public byte[] getMandate() {

   	return mandate;

   }

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 fed9cc72b..ad4e45a2b 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
@@ -108,10 +108,25 @@ public class MISSimpleClient {
 	    

 			ArrayList foundMandates = new ArrayList();

 			for (int i=0; i<mandateElements.getLength(); i++) {

-				Element mandate = (Element) mandateElements.item(i);

+				Element mandate = (Element) mandateElements.item(i);
+				
+//				try {
+//					String s = DOMUtils.serializeNode(mandate);
+//					System.out.println("\n\n Mandate: \n" + s);
+//				} catch (IOException e) {
+//					// TODO Auto-generated catch block
+//					e.printStackTrace();
+//				}
+				
+				

 				MISMandate misMandate = new MISMandate();

-				if (mandate.hasAttribute("ProfessionalRepresentative")) {

+				if (mandate.hasAttribute("ProfessionalRepresentative")) {
+//					System.out.println("OID: " + mandate.getAttribute("ProfessionalRepresentative"));

 					misMandate.setProfRep(mandate.getAttribute("ProfessionalRepresentative"));

+				}
+				if (mandate.hasAttribute("OWbPK")) {
+					misMandate.setOWbPK(mandate.getAttribute("OWbPK"));
+//					System.out.println("OWBPK: " + mandate.getAttribute("OWbPK"));
 				}

 				

 				//misMandate.setMandate(Base64.decodeBase64(DOMUtils.getText(mandate)));