1 files changed, 16 insertions, 21 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 9dede7179..664d0cf57 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
@@ -14,7 +14,6 @@ import javax.xml.namespace.QName;
 import org.opensaml.common.binding.BasicSAMLMessageContext;
 import org.opensaml.saml2.binding.decoding.HTTPPostDecoder;
 import org.opensaml.saml2.core.Assertion;
-import org.opensaml.saml2.core.Attribute;
 import org.opensaml.saml2.metadata.RequestedAttribute;
 import org.opensaml.ws.transport.http.HTTPInTransport;
 import org.opensaml.ws.transport.http.HTTPOutTransport;
@@ -35,7 +34,6 @@ import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.auth.exception.ParseException;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.util.XMLUtil;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
@@ -44,6 +42,7 @@ import at.gv.egovernment.moa.util.StringUtils;
 import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
 import eu.stork.mw.messages.saml.STORKResponse;
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.vidp.messages.common.STORKConstants;
 import eu.stork.vidp.messages.util.SAMLUtil;
 
@@ -389,33 +388,29 @@ public class STORKResponseProcessor {
 	
 	/**
 	 * Transforms additional STORK attributes to MOA Extended attributes
-	 * @param storkAttributeList STORK attribute list
+	 * @param iPersonalAttributeList STORK attribute list
 	 * @return
 	 */
-	public static List<ExtendedSAMLAttribute> addAdditionalSTORKAttributes(List<Attribute> storkAttributeList) {
+	public static List<ExtendedSAMLAttribute> addAdditionalSTORKAttributes(IPersonalAttributeList iPersonalAttributeList) {
 		List<ExtendedSAMLAttribute> moaExtendedSAMLAttributeList = new Vector<ExtendedSAMLAttribute>();
 		
+		if(null == iPersonalAttributeList)
+			return moaExtendedSAMLAttributeList;
+		
 		Logger.trace("Adding the following attributes to MOA assertion: ");
 		int count = 0;
-		//only add attributes different than eIdentifier, given name, surname, dateOfBirth, signedDoc
-		for (Attribute attribute : storkAttributeList) {
-			//attribute is not in default returned attribute set
-			if (!STORKConstants.DEFAULT_STORK_RETURNED_ATTRIBUTE_SET.contains(attribute.getName())) {
-				
-				String attributeValue = null;
-				if (!attribute.getAttributeValues().isEmpty()) {
-					//we have attribute value
-					attributeValue = SAMLUtil.getStringValueFromXMLObject(attribute.getAttributeValues().get(0));
-				}
-				ExtendedSAMLAttribute extendedSAMLAttribute = 
-					new ExtendedSAMLAttributeImpl(attribute.getName(), attributeValue, Constants.STORK_NS_URI, 0);
-				moaExtendedSAMLAttributeList.add(extendedSAMLAttribute);
-				count++;
-				Logger.trace("Additional attribute: " + attribute.getName());
-			}				
+
+		for (PersonalAttribute attribute : iPersonalAttributeList) {
+			Object attributeValue = attribute.getValue();
+			if (null == attributeValue)
+				attributeValue = attribute.getComplexValue();
+			ExtendedSAMLAttribute extendedSAMLAttribute = 
+				new ExtendedSAMLAttributeImpl(attribute.getName(), attributeValue, Constants.STORK_NS_URI, 0);
+			moaExtendedSAMLAttributeList.add(extendedSAMLAttribute);
+			count++;
+			Logger.trace("Additional attribute: " + attribute.getName());
 		}
 		
-		
 		Logger.debug("Added " + count + " STORK attribute(s) to the MOA assertion.");		
 		
 		return moaExtendedSAMLAttributeList;