fixed target type for MIS info

3 files changed, 37 insertions, 19 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 60b269059..94cab53d4 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
@@ -1710,7 +1710,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @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 {
+	     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 targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
 
 			try {
 		    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
@@ -1739,7 +1739,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 			    	MISType mis = new MISType();
 			    	
 			    	Target targetObject = new Target();
-			    	targetObject.setValue(target);
+			    	targetObject.setType(targetType);
+			    	targetObject.setValue(targetValue);
 			    	mis.setTarget(targetObject);
 			    	
 			    	mis.setOAFriendlyName(oaFriendlyName);
@@ -1777,7 +1778,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @throws ConfigurationException the configuration exception
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(Element signature) throws SZRGWClientException, ConfigurationException {
-		return getIdentityLink(null, null, null, null, null, XMLHelper.nodeToString(signature), null, null, null);
+		return getIdentityLink(null, null, null, null, XMLHelper.nodeToString(signature));
 	}
 
 	/**
@@ -1793,7 +1794,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @throws ConfigurationException the configuration exception
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String signature) throws SZRGWClientException {
-		return getIdentityLink(PEPSIdentifier, PEPSFirstname, PEPSFamilyname, PEPSDateOfBirth, null, signature, null, null, null);
+		return getIdentityLink(PEPSIdentifier, PEPSFirstname, PEPSFamilyname, PEPSDateOfBirth, null, signature, null, null, null, null, null, null, null);
 	}
 
 	/**
@@ -1810,10 +1811,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(String citizenSignature,
 			String representative, String represented, String mandateContent,
-			String organizationAddress, String organizationType, String target, String oaFriendlyName, String filters) throws SZRGWClientException {
+			String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
 		return getIdentityLink(null, null, null, null, null,
 				citizenSignature, represented, representative, mandateContent, organizationAddress,
-				organizationType, target, oaFriendlyName, filters);
+				organizationType, targetType, targetValue, oaFriendlyName, filters);
 	}
 	
  	/**
@@ -1833,10 +1834,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, String target, String oaFriendlyName, String filters) throws SZRGWClientException {
+ 			String mandate, String targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
  		return getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender,
  				citizenSignature, representative, represented, mandate, null,
- 				null, target, oaFriendlyName, filters);
+ 				null, targetType, targetValue, 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 bd8c6420d..9dfce7838 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
@@ -200,6 +200,22 @@ public class PEPSConnectorServlet extends AuthServlet {
     		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());

     		if (oaParam == null)

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

+    		

+    		// retrieve target

+	        //TODO: check in case of SSO!!!

+	        String targetType = null;

+	        String targetValue = null;

+	        if(oaParam.getBusinessService()) {

+	        	String id = oaParam.getIdentityLinkDomainIdentifier();

+	        	if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_))

+	        		targetValue = id.substring(AuthenticationSession.REGISTERANDORDNR_PREFIX_.length());

+	        	else

+	        		targetValue = moasession.getDomainIdentifier();

+	        	targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_;

+	        } else {

+	        	targetType = AuthenticationSession.TARGET_PREFIX_;

+    			targetValue = oaParam.getTarget();

+	        }

 			

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

 			//contact SZR Gateway

@@ -207,7 +223,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 			try {

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

 																		  oaParam.getFriendlyName(), 

-																		  oaParam.getTarget(), 

+																		  targetType, targetValue, 

 																		  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

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 6d88a1684..20ceb2128 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
@@ -144,16 +144,17 @@ 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

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

+	 *

+	 * @param attributeList the attribute list

+	 * @param oaFriendlyName the oa friendly name

+	 * @param targetType the target type

+	 * @param targetValue the target value

+	 * @param filters the filters

 	 * @return Identity Link

-	 * @throws STORKException

+	 * @throws STORKException the sTORK exception

 	 */

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

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

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

 

 		CreateIdentityLinkResponse identityLinkResponse = null;

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

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

 					

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

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

 				} else {

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

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

@@ -192,7 +193,7 @@ public class STORKResponseProcessor {
 

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

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

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

+							represented, mandate, targetType, targetValue, oaFriendlyName, filters);

 				}

 			} else {

 				// we do not have a representation case