supply MIS information to SZRGW

3 files changed, 63 insertions, 15 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 decf166c4..60b269059 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
@@ -135,9 +135,13 @@ import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.StringUtils;
 import at.gv.egovernment.moa.util.XPathUtils;
+import at.gv.util.xsd.mis.MandateIdentifiers;
+import at.gv.util.xsd.mis.Target;
 import at.gv.util.xsd.srzgw.CreateIdentityLinkRequest;
 import at.gv.util.xsd.srzgw.CreateIdentityLinkRequest.PEPSData;
 import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
+import at.gv.util.xsd.srzgw.MISType;
+import at.gv.util.xsd.srzgw.MISType.Filters;
 import eu.stork.oasisdss.api.ApiUtils;
 import eu.stork.oasisdss.api.ApiUtilsException;
 import eu.stork.oasisdss.profile.DocumentType;
@@ -1700,20 +1704,19 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
 	/**
 	   * Does the request to the SZR-GW
-	   * @param signature XMLDSIG signature
+	 * @param oaFriendlyName 
+	 * @param signature XMLDSIG signature
 	   * @return Identity link assertion
 	 * @throws SZRGWClientException 
 	   */
 
-	     public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String gender, String citizenSignature, String represented, String representative, String mandateContent, String organizationAddress, String organizationType) throws SZRGWClientException {
+	     public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String gender, String citizenSignature, String represented, String representative, String mandateContent, String organizationAddress, String organizationType, String target, String oaFriendlyName, String filters) throws SZRGWClientException {
 
-		    SZRGWClient client = null;
-		 
 			try {
 		    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
 		    	ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
 
-		    	client = new SZRGWClient(connectionParameters);
+		    	SZRGWClient client = new SZRGWClient(connectionParameters);
 		    	 
 		    	
 		    	CreateIdentityLinkRequest request = new CreateIdentityLinkRequest();
@@ -1732,8 +1735,24 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		    	data.setLegalPersonCanonicalRegisteredAddress(organizationAddress);
 		    	data.setLegalPersonTranslatableType(organizationType);
 
-		    	// TODO add MIS data
-//		    	request.setMIS(value)
+		    	if(null != mandateContent) {
+			    	MISType mis = new MISType();
+			    	
+			    	Target targetObject = new Target();
+			    	targetObject.setValue(target);
+			    	mis.setTarget(targetObject);
+			    	
+			    	mis.setOAFriendlyName(oaFriendlyName);
+			    	
+			    	Filters filterObject = new Filters();
+			    	MandateIdentifiers mandateIds = new MandateIdentifiers();
+			        for(String current : filters.split(","))
+			        	mandateIds.getMandateIdentifier().add(current.trim());
+			    	filterObject.setMandateIdentifiers(mandateIds);
+			    	mis.setFilters(filterObject);
+			    	
+			    	request.setMIS(mis);
+		    	}
 		    	
 		    	Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
 				CreateIdentityLinkResponse response = client.sentCreateIDLRequest(request , connectionParameters.getUrl());
@@ -1791,8 +1810,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(String citizenSignature,
 			String representative, String represented, String mandateContent,
-			String organizationAddress, String organizationType) throws SZRGWClientException {
-		return getIdentityLink(null, null, null, null, null, citizenSignature, represented, representative, mandateContent, organizationAddress, organizationType);
+			String organizationAddress, String organizationType, String target, String oaFriendlyName, String filters) throws SZRGWClientException {
+		return getIdentityLink(null, null, null, null, null,
+				citizenSignature, represented, representative, mandateContent, organizationAddress,
+				organizationType, target, oaFriendlyName, filters);
 	}
 	
  	/**
@@ -1812,8 +1833,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 public CreateIdentityLinkResponse getIdentityLink(String eIdentifier,
  			String givenName, String lastName, String dateOfBirth, String gender,
  			String citizenSignature, String representative, String represented,
- 			String mandate) throws SZRGWClientException {
- 		return getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender, citizenSignature, representative, represented, mandate, null, null);
+ 			String mandate, String target, String oaFriendlyName, String filters) throws SZRGWClientException {
+ 		return getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender,
+ 				citizenSignature, representative, represented, mandate, null,
+ 				null, target, oaFriendlyName, filters);
  	}
 
 	/**
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index 3129c9e31..bd8c6420d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -30,6 +30,8 @@ import at.gv.egovernment.moa.id.auth.stork.STORKException;
 import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor;

 import at.gv.egovernment.moa.id.auth.stork.VelocityProvider;

 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;

+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;

+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;

 import at.gv.egovernment.moa.id.moduls.ModulUtils;

 import at.gv.egovernment.moa.id.proxy.parser.SAMLResponseParser;

 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;

@@ -185,11 +187,28 @@ public class PEPSConnectorServlet extends AuthServlet {
 			Logger.debug("Foregin Citizen signature successfully extracted from STORK Assertion (signedDoc)");

 			Logger.debug("Citizen signature will be verified by SZR Gateway!");

 			

+			Logger.debug("fetching OAParameters from database");

+			

+			//read configuration paramters of OA

+    	    AuthenticationSession moasession;

+			try {

+				moasession = AuthenticationSessionStoreage.getSession(moaSessionID);

+			} catch (MOADatabaseException e2) {

+				Logger.error("could not retrieve moa session");

+				throw new AuthenticationException("auth.01", null);

+			}

+    		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());

+    		if (oaParam == null)

+    				throw new AuthenticationException("auth.00", new Object[] { moasession.getPublicOAURLPrefix() });

+			

 			Logger.debug("Starting connecting SZR Gateway");

 			//contact SZR Gateway

 			IdentityLink identityLink = null;

 			try {

-				identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList());

+				identityLink = STORKResponseProcessor.connectToSZRGateway(authnResponse.getPersonalAttributeList(),

+																		  oaParam.getFriendlyName(), 

+																		  oaParam.getTarget(), 

+																		  oaParam.getMandateProfiles());

 			} catch (STORKException e) {

 				// this is really nasty but we work against the system here. We are supposed to get the gender attribute from

 				// stork. If we do not, we cannot register the person in the ERnP - we have to have the

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
index 5406dc0e1..8385c5dbe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
@@ -334,11 +334,15 @@ public class STORKResponseProcessor {
 

 	/**

 	 * Handels connection to SZR-GW and returns Identity Link on success

+	 * @param oaFriendlyName 

+	 * @param target 

+	 * @param filters 

+	 * @param filter 

 	 * @param iPersonalAttributeList Received attribute List in assertion

 	 * @return Identity Link

 	 * @throws STORKException

 	 */

-	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList) throws STORKException {

+	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList, String oaFriendlyName, String target, String filters) throws STORKException {

 		Logger.trace("Calling SZR Gateway with the following attributes:");

 

 		CreateIdentityLinkResponse identityLinkResponse = null;

@@ -362,7 +366,7 @@ public class STORKResponseProcessor {
 					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

 					String organizationType = getAttributeValue("translateableType", attributeList);

 					

-					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, representative, represented, mandate, organizationAddress, organizationType);

+					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, representative, represented, mandate, organizationAddress, organizationType, target, oaFriendlyName, filters);

 				} else {

 					// if we get here, we have a natural person representing another natural person

 					String eIdentifier = getAttributeValue("eIdentifier", attributeList);

@@ -375,7 +379,9 @@ public class STORKResponseProcessor {
 					if (!StringUtils.isEmpty(dateOfBirth))

 						dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

 

-					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender, citizenSignature, representative, represented, mandate);

+					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, 

+							givenName, lastName, dateOfBirth, gender, citizenSignature, representative,

+							represented, mandate, target, oaFriendlyName, filters);

 				}

 			} else {

 				// we do not have a representation case