add STORK attribute fiscalNumber to SZR-Gateway request

2 files changed, 15 insertions, 14 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 766f6e984..34a327861 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
@@ -1714,7 +1714,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 targetType, String targetValue, String oaFriendlyName, List<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, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
 
 			try {
 		    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
@@ -1731,6 +1731,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		    	data.setFamilyname(PEPSFamilyname);
 		    	data.setFirstname(PEPSFirstname);
 		    	data.setIdentifier(PEPSIdentifier);
+		    	data.setFiscalNumber(PEPSFiscalNumber);
 
 		    	data.setRepresentative(representative);
 		    	data.setRepresented(represented);
@@ -1784,7 +1785,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, XMLHelper.nodeToString(signature));
+		return getIdentityLink(null, null, null, null, XMLHelper.nodeToString(signature), null);
 	}
 
 	/**
@@ -1799,8 +1800,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @throws SZRGWClientException the sZRGW client exception
 	 * @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, null, null, null, null);
+	public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String signature, String PEPSFiscalNumber) throws SZRGWClientException {
+		return getIdentityLink(PEPSIdentifier, PEPSFirstname, PEPSFamilyname, PEPSDateOfBirth, null, signature, null, null, null, null, null, null, null, PEPSFiscalNumber);
 	}
 
 	/**
@@ -1817,10 +1818,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(String citizenSignature,
 			String representative, String represented, String mandateContent,
-			String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, List<String> filters) throws SZRGWClientException {
+			String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
 		return getIdentityLink(null, null, null, null, null,
 				citizenSignature, represented, representative, mandateContent, organizationAddress,
-				organizationType, targetType, targetValue, oaFriendlyName, filters);
+				organizationType, targetType, targetValue, oaFriendlyName, filters, PEPSFiscalNumber);
 	}
 	
  	/**
@@ -1840,10 +1841,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 targetType, String targetValue, String oaFriendlyName, List<String> filters) throws SZRGWClientException {
+ 			String mandate, String targetType, String targetValue, String oaFriendlyName, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
  		return getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender,
  				citizenSignature, representative, represented, mandate, null,
- 				null, targetType, targetValue, oaFriendlyName, filters);
+ 				null, targetType, targetValue, oaFriendlyName, filters, PEPSFiscalNumber);
  	}
 
 	/**
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 fd0d2298a..dbb184e43 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
@@ -133,9 +133,9 @@ public class STORKResponseProcessor {
 		try {

 			Logger.trace("Starting call...");

 

-			

 			// if there is no signedDoc attribute, we cannot go on

 			String citizenSignature = getAttributeValue("signedDoc", attributeList);

+			String fiscalNumber = getAttributeValue("fiscalNumber", attributeList);

 			

 			// if we have a signedDoc we test for a representation case

 			if(hasAttribute("mandateContent", attributeList) || hasAttribute("representative", attributeList) || hasAttribute("represented", attributeList)) {

@@ -148,15 +148,15 @@ public class STORKResponseProcessor {
 					// if we get here, we have a natural person representing a legal person

 					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

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

-					

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

+									

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

 				} else {

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

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

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

 					String lastName = getAttributeValue("surname", attributeList);

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

-					

+			

 					// gender attribute is mandatory here because of some legal stuff

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

 					

@@ -165,7 +165,7 @@ public class STORKResponseProcessor {
 

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

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

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

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

 				}

 			} else {

 				// we do not have a representation case

@@ -175,7 +175,7 @@ public class STORKResponseProcessor {
 				String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

 				if (!StringUtils.isEmpty(dateOfBirth))

 					dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

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

+				identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, citizenSignature, fiscalNumber);

 			}

 	    	

 	    	if (null != identityLinkResponse.getErrorResponse()){