refactored attribute parsing

1 files changed, 48 insertions, 28 deletions

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 e81adfb52..466d86f87 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
@@ -296,6 +296,22 @@ public class STORKResponseProcessor {
 		

 		

 	}

+	

+	/**

+	 * Checks for attribute.

+	 *

+	 * @param attributeName the attribute name

+	 * @param attributeList the attribute list

+	 * @return true, if successful

+	 */

+	private static boolean hasAttribute(String attributeName, IPersonalAttributeList attributeList) {

+		try {

+			getAttributeValue(attributeName, attributeList);

+			return true;

+		} catch(STORKException e) {

+			return false;

+		}

+	}

 

 	/**

 	 * helper for reading attributes. Handles logging and error handling.

@@ -325,52 +341,56 @@ public class STORKResponseProcessor {
 	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList) throws STORKException {

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

 

-		// fetch mandatory attributes

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

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

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

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

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

-		if (!StringUtils.isEmpty(dateOfBirth)) {

-			dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

-		} 

-		

-		CreateIdentityLinkResponse response;

+		CreateIdentityLinkResponse identityLinkResponse = null;

 		IdentityLink identityLink = null;

 		try {

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

 

-			// do we have a case of representation?

-			try {

+			

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

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

+			

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

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

+				// we have a representation case

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

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

 				String mandate = getAttributeValue("mandateContent", attributeList);

 				

-				// we definitely know we have a representation case here

-				// lets try if the represented is an organization

-				try {

+				if(!hasAttribute("dateOfBirth", attributeList)) {

+					// if we get here, we have a natural person representing a legal person

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

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

 					

-					// if we got here, we have a natural person representing a legal person

-					response = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, citizenSignature, representative, represented, mandate, organizationAddress, organizationType);

-				} catch(STORKException e1) {

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

+				} 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);

+					if (!StringUtils.isEmpty(dateOfBirth))

+						dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

 

-					// if we get here we have natural persons representing each other

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

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

 				}

-			} catch(STORKException e) {

+			} else {

 				// we do not have a representation case

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

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

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

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

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

+				if (!StringUtils.isEmpty(dateOfBirth))

+					dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

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

 			}

-

-   	    	

-	    	if (null != response.getErrorResponse()){

+	    	

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

 	    		// TODO fix exception parameter

-	    		throw new SZRGWClientException(response.getErrorResponse().getErrorCode().toString(), null);

+	    		throw new SZRGWClientException(identityLinkResponse.getErrorResponse().getErrorCode().toString(), null);

 	    	}

 	    	else {

-		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream(response.getIdentityLink()));

+		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream(identityLinkResponse.getIdentityLink()));

 		    	identityLink = ilParser.parseIdentityLink();

 		    	

 		    	Logger.debug("Received Identity Link from SZR Gateway");