interface adaptions for szrgw #1

1 files changed, 44 insertions, 17 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 e47a43c90..e2112a4d9 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
@@ -40,6 +40,7 @@ import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.DateTimeUtils;

 import at.gv.egovernment.moa.util.StringUtils;

 import eu.stork.mw.messages.saml.STORKResponse;

+import eu.stork.peps.auth.commons.IPersonalAttributeList;

 import eu.stork.vidp.messages.common.STORKConstants;

 import eu.stork.vidp.messages.util.SAMLUtil;

 import eu.stork.vidp.messages.util.XMLUtil;

@@ -294,29 +295,41 @@ public class STORKResponseProcessor {
 		

 		

 	}

-	

+

+	/**

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

+	 *

+	 * @param attributeName the attribute name

+	 * @param attributeList the attribute list

+	 * @return the attribute value

+	 * @throws STORKException the sTORK exception

+	 */

+	private static String getAttributeValue(String attributeName, IPersonalAttributeList attributeList) throws STORKException {

+		try {

+			String result = attributeList.get(attributeName).getValue().get(0);

+			Logger.trace(attributeName + " : " + result);

+			return result;

+		} catch(NullPointerException e) {

+			Logger.error(attributeName + " not found in response");

+			throw new STORKException(attributeName + " not found in response");

+		}

+	}

+

 	/**

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

-	 * @param citizenSignature Citizen signature

-	 * @param attributeList Received attribute List in assertion

+	 * @param iPersonalAttributeList Received attribute List in assertion

 	 * @return Identity Link

 	 * @throws STORKException

 	 */

-	public static IdentityLink connectToSZRGateway(Element citizenSignature, List<Attribute> attributeList) throws STORKException {				

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

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

 

-		String eIdentifier = SAMLUtil.getAttributeStringValue(attributeList, STORKConstants.STORK_ATTRIBUTE_FISCALNUMBER);

-		Logger.trace(STORKConstants.STORK_ATTRIBUTE_EIDENTIFIER + " : " + eIdentifier);

-

-		String givenName = SAMLUtil.getAttributeStringValue(attributeList, STORKConstants.STORK_ATTRIBUTE_GIVENNAME);

-		Logger.trace(STORKConstants.STORK_ATTRIBUTE_GIVENNAME+ " : " + givenName);

-		

-		String lastName = SAMLUtil.getAttributeStringValue(attributeList, STORKConstants.STORK_ATTRIBUTE_SURNAME);

-		Logger.trace(STORKConstants.STORK_ATTRIBUTE_SURNAME+ " : " + lastName);

-		

-		String dateOfBirth = SAMLUtil.getAttributeStringValue(attributeList, STORKConstants.STORK_ATTRIBUTE_DATEOFBIRTH);

-		Logger.trace(STORKConstants.STORK_ATTRIBUTE_DATEOFBIRTH + " : " + dateOfBirth);

-		

+		// fetch mandatory attributes

+		String citizenSignature = getAttributeValue(STORKConstants.STORK_ATTRIBUTE_SIGNEDDOC, attributeList);

+		String eIdentifier = getAttributeValue(STORKConstants.STORK_ATTRIBUTE_EIDENTIFIER, attributeList);

+		String givenName = getAttributeValue(STORKConstants.STORK_ATTRIBUTE_GIVENNAME, attributeList);

+		String lastName = getAttributeValue(STORKConstants.STORK_ATTRIBUTE_SURNAME, attributeList);

+		String dateOfBirth = getAttributeValue(STORKConstants.STORK_ATTRIBUTE_DATEOFBIRTH, attributeList);

 		if (!StringUtils.isEmpty(dateOfBirth)) {

 			dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

 		} 

@@ -325,7 +338,21 @@ public class STORKResponseProcessor {
 		IdentityLink identityLink = null;

 		try {

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

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

+

+			// do we have a case of representation?

+			try {

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

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

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

+

+				// if we get here we have a representation case

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

+

+			} catch(STORKException e) {

+				// we do not have a representation case

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

+			}

+

 			if (response.isError()) {

 				Logger.error("Receveid ErrorResponse from SZR Gateway.");

 	    		throw new SZRGWClientException(response.getError());