update eID4U attribute builder in MOA-ID to support complexe attributes

1 files changed, 12 insertions, 5 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eid4u/IdTypeAttrBuilder.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eid4u/IdTypeAttrBuilder.java
index 5077c09a2..e2aff59e9 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eid4u/IdTypeAttrBuilder.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eid4u/IdTypeAttrBuilder.java
@@ -7,6 +7,7 @@ import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 import at.gv.egiz.eid4u.api.attributes.Definitions;
+import at.gv.egiz.eid4u.api.attributes.natural.IdType;
 import at.gv.egovernment.moa.id.protocols.eidas.attributes.builder.IeIDASAttribute;
 import at.gv.egovernment.moa.id.protocols.eidas.attributes.builder.eIDASMetadata;
 
@@ -17,12 +18,18 @@ public class IdTypeAttrBuilder implements IeIDASAttribute {
 	public <ATT> ATT build(ISPConfiguration oaParam, IAuthData authData, IAttributeGenerator<ATT> g)
 			throws AttributeBuilderException {
 		
-		String idType= authData.getGenericData(getName(), String.class);
-		if (StringUtils.isNotEmpty(idType))
-			return g.buildStringAttribute(Definitions.IDTYPE_FRIENDLYNAME, getName(), idType);
+		Object idTypeObj= authData.getGenericData(getName(), Object.class);
 		
-		else
-			throw new AttributeBuilderException("Attribute '" + getName() + "' is not available");
+		if (idTypeObj instanceof IdType)
+			return g.buildStringAttribute(Definitions.IDTYPE_FRIENDLYNAME, getName(), ((IdType)idTypeObj).getValue());
+		
+		else if (idTypeObj instanceof String) {
+			String idType = (String)idTypeObj;
+			if (StringUtils.isNotEmpty(idType))
+				return g.buildStringAttribute(Definitions.IDTYPE_FRIENDLYNAME, getName(), idType);
+		}
+		
+		throw new AttributeBuilderException("Attribute '" + getName() + "' is not available");
 		
 	}