Fixed PVP2 Attribute builder interface

23 files changed, 102 insertions, 39 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
index 1962d1c7b..11ec2fe25 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/PVPAttributeBuilder.java
@@ -8,6 +8,8 @@ import java.util.List;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.BPKAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.BirthdateAttributeBuilder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.EIDCitizenQAALevelAttributeBuilder;
@@ -68,9 +70,10 @@ public class PVPAttributeBuilder {
 	}
 
 	public static Attribute buildAttribute(String name,
-			AuthenticationSession authSession) throws PVP2Exception {
+			AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if (builders.containsKey(name)) {
-			return builders.get(name).build(authSession);
+			return builders.get(name).build(authSession, oaParam, authData);
 		}
 		return null;
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
index c438cb18c..67a24f90a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
@@ -159,13 +159,23 @@ public class PVP2AssertionBuilder implements PVPConstants {
 		 * null, true); } }
 		 */
 
+		// TODO: LOAD oaParam from request and not from MOASession in case of
+		// SSO
+		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+				.getOnlineApplicationParameter(
+						authSession.getPublicOAURLPrefix());
+
+		AuthenticationData authData = AuthenticationServer
+				.buildAuthenticationData(authSession, oaParam,
+						oaParam.getTarget());
+
 		Iterator<RequestedAttribute> it = attributeConsumingService
 				.getRequestAttributes().iterator();
 		while (it.hasNext()) {
 			RequestedAttribute reqAttribut = it.next();
 			try {
 				Attribute attr = PVPAttributeBuilder.buildAttribute(
-						reqAttribut.getName(), authSession);
+						reqAttribut.getName(), authSession, oaParam, authData);
 				if (attr == null) {
 					if (reqAttribut.isRequired()) {
 						throw new UnprovideableAttributeException(
@@ -189,23 +199,12 @@ public class PVP2AssertionBuilder implements PVPConstants {
 			assertion.getAttributeStatements().add(attributeStatement);
 		}
 
-		// TODO: LOAD oaParam from request and not from MOASession in case of
-		// SSO
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
-				.getOnlineApplicationParameter(
-						authSession.getPublicOAURLPrefix());
-
-		AuthenticationData authData = AuthenticationServer
-				.buildAuthenticationData(authSession, oaParam,
-						oaParam.getTarget());
-
 		// TL: getIdentificationValue holds the baseID --> change to pBK
 		// subjectNameID.setValue(authData.getIdentificationValue());
 
 		subjectNameID.setFormat(NameID.PERSISTENT);
-		//TODO: build IdType in authData
-		subjectNameID.setNameQualifier(authData
-				.getIdentificationType());
+		// TODO: build IdType in authData
+		subjectNameID.setNameQualifier(authData.getIdentificationType());
 		if (authSession.getBusinessService())
 			subjectNameID.setValue(authData.getWBPK());
 		else
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BPKAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BPKAttributeBuilder.java
index c2c1c8687..657f974f8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BPKAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BPKAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class BPKAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class BPKAttributeBuilder extends BaseAttributeBuilder {
 		return BPK_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		// TODO: authSession + oaParam => authData
 		String bpk = ""; //authSession.getAssertionAuthData().getIdentificationValue();
 		if(bpk.length() > BPK_MAX_LENGTH) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
index 84011436e..fa42fc54f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/BirthdateAttributeBuilder.java
@@ -8,6 +8,8 @@ import java.util.Date;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class BirthdateAttributeBuilder extends BaseAttributeBuilder {
 
@@ -17,7 +19,8 @@ public class BirthdateAttributeBuilder extends BaseAttributeBuilder {
 		return BIRTHDATE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		try {
 			DateFormat identityLinkFormat = new SimpleDateFormat(
 					IDENTITY_LINK_DATE_FORMAT);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDCitizenQAALevelAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDCitizenQAALevelAttributeBuilder.java
index d9c66e6f0..5ddd87c7b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDCitizenQAALevelAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDCitizenQAALevelAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class EIDCitizenQAALevelAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class EIDCitizenQAALevelAttributeBuilder extends BaseAttributeBuilder {
 		return EID_CITIZEN_QAA_LEVEL_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		return buildIntegerAttribute(EID_CITIZEN_QAA_LEVEL_FRIENDLY_NAME, 
 				EID_CITIZEN_QAA_LEVEL_NAME, 4);
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
index 2452e35c9..08e4e67b3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDIssuingNationAttributeBuilder.java
@@ -8,6 +8,8 @@ import javax.naming.ldap.Rdn;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class EIDIssuingNationAttributeBuilder extends BaseAttributeBuilder {
@@ -16,7 +18,8 @@ public class EIDIssuingNationAttributeBuilder extends BaseAttributeBuilder {
 		return EID_ISSUING_NATION_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		String countryCode = "AT";
 
 		
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSectorForIDAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSectorForIDAttributeBuilder.java
index 785db286d..9b6884993 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSectorForIDAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSectorForIDAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class EIDSectorForIDAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class EIDSectorForIDAttributeBuilder extends BaseAttributeBuilder {
 		return EID_SECTOR_FOR_IDENTIFIER_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		// TODO: authSession + oaParam => authData
 		return buildStringAttribute(EID_SECTOR_FOR_IDENTIFIER_FRIENDLY_NAME,
 				EID_SECTOR_FOR_IDENTIFIER_NAME, ""/*authSession.getAssertionAuthData().getIdentificationType()*/);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/GivenNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/GivenNameAttributeBuilder.java
index f9a217810..5c8151c01 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/GivenNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/GivenNameAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class GivenNameAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class GivenNameAttributeBuilder extends BaseAttributeBuilder {
 		return GIVEN_NAME_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		return buildStringAttribute(GIVEN_NAME_FRIENDLY_NAME, GIVEN_NAME_NAME, authSession.getIdentityLink().getGivenName());
 	}
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/IAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/IAttributeBuilder.java
index 3ed4e3870..173fbd52f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/IAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/IAttributeBuilder.java
@@ -3,10 +3,13 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 
 public interface IAttributeBuilder {
 	public String getName();
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception;
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception;
 	public Attribute buildEmpty();
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
index 9e51f97ae..cecd90448 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateFullMandateAttributeBuilder.java
@@ -7,9 +7,9 @@ import javax.xml.transform.TransformerException;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
-import at.gv.egovernment.moa.id.protocols.pvp2x.utils.AttributeExtractor;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
 
@@ -19,7 +19,8 @@ public class MandateFullMandateAttributeBuilder extends BaseAttributeBuilder {
 		return MANDATE_FULL_MANDATE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession)
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData)
 			throws PVP2Exception {
 		if (authSession.getUseMandate()) {
 			if (authSession.getMandate() != null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
index f52f5786d..15059c036 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonFullNameAttributeBuilder.java
@@ -6,6 +6,8 @@ import org.w3c.dom.Element;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -17,7 +19,8 @@ public class MandateLegalPersonFullNameAttributeBuilder extends BaseAttributeBui
 		return MANDATE_LEG_PER_FULL_NAME_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinAttributeBuilder.java
index ac55c2347..820efb209 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinAttributeBuilder.java
@@ -7,6 +7,8 @@ import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -18,7 +20,8 @@ public class MandateLegalPersonSourcePinAttributeBuilder extends BaseAttributeBu
 		return MANDATE_LEG_PER_SOURCE_PIN_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinTypeAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinTypeAttributeBuilder.java
index d5ebdea24..44b58d04f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinTypeAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateLegalPersonSourcePinTypeAttributeBuilder.java
@@ -7,6 +7,8 @@ import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -19,7 +21,8 @@ public class MandateLegalPersonSourcePinTypeAttributeBuilder extends
 		return MANDATE_LEG_PER_SOURCE_PIN_TYPE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession)
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData)
 			throws PVP2Exception {
 		if (authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBPKAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBPKAttributeBuilder.java
index b53b92aca..bbb610d62 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBPKAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBPKAttributeBuilder.java
@@ -7,6 +7,8 @@ import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -18,7 +20,8 @@ public class MandateNaturalPersonBPKAttributeBuilder extends BaseAttributeBuilde
 		return MANDATE_NAT_PER_BPK_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
index eae3023db..a87d4d25c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonBirthDateAttributeBuilder.java
@@ -11,6 +11,8 @@ import org.w3c.dom.Element;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.InvalidDateFormatException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
@@ -24,7 +26,8 @@ public class MandateNaturalPersonBirthDateAttributeBuilder extends
 		return MANDATE_NAT_PER_BIRTHDATE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession)
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData)
 			throws PVP2Exception {
 		if (authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonFamilyNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonFamilyNameAttributeBuilder.java
index 38d540883..6744e5d20 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonFamilyNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonFamilyNameAttributeBuilder.java
@@ -9,6 +9,8 @@ import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PersonNameType.FamilyName;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -20,7 +22,8 @@ public class MandateNaturalPersonFamilyNameAttributeBuilder  extends BaseAttribu
 		return MANDATE_NAT_PER_FAMILY_NAME_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonGivenNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonGivenNameAttributeBuilder.java
index a876f600b..67aa8df0e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonGivenNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateNaturalPersonGivenNameAttributeBuilder.java
@@ -8,6 +8,8 @@ import org.w3c.dom.Element;
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -19,7 +21,8 @@ public class MandateNaturalPersonGivenNameAttributeBuilder extends BaseAttribute
 		return MANDATE_NAT_PER_GIVEN_NAME_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepDescAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepDescAttributeBuilder.java
index 6a066874a..b7c356112 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepDescAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepDescAttributeBuilder.java
@@ -5,6 +5,8 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.AttributeExtractor;
@@ -15,7 +17,8 @@ public class MandateProfRepDescAttributeBuilder extends BaseAttributeBuilder {
 		return MANDATE_PROF_REP_DESC_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
index ddc7f6671..740a99649 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
@@ -5,6 +5,8 @@ import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.AttributeExtractor;
@@ -15,7 +17,8 @@ public class MandateProfRepOIDAttributeBuilder extends BaseAttributeBuilder {
 		return MANDATE_PROF_REP_OID_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
index 8625eddeb..5a50473d3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
@@ -5,6 +5,8 @@ import org.w3c.dom.Element;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
@@ -15,7 +17,8 @@ public class MandateReferenceValueAttributeBuilder extends BaseAttributeBuilder
 		return MANDATE_REFERENCE_VALUE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws PVP2Exception {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws PVP2Exception {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateTypeAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateTypeAttributeBuilder.java
index 0064ed102..bc7fdaf73 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateTypeAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateTypeAttributeBuilder.java
@@ -5,6 +5,8 @@ import org.w3c.dom.Element;
 
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.ResponderErrorException;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 
@@ -14,7 +16,8 @@ public class MandateTypeAttributeBuilder extends BaseAttributeBuilder {
 		return MANDATE_TYPE_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) throws ResponderErrorException {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) throws ResponderErrorException {
 		if(authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
 			if(mandate == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PVPVersionAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PVPVersionAttributeBuilder.java
index a901a54ea..545d70d76 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PVPVersionAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PVPVersionAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class PVPVersionAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class PVPVersionAttributeBuilder extends BaseAttributeBuilder {
 		return PVP_VERSION_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		return buildStringAttribute(PVP_VERSION_FRIENDLY_NAME, PVP_VERSION_NAME, PVP_VERSION_2_1);
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PrincipalNameAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PrincipalNameAttributeBuilder.java
index 7ffdca50e..7ca7eb829 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PrincipalNameAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/PrincipalNameAttributeBuilder.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.AuthenticationData;
 
 public class PrincipalNameAttributeBuilder extends BaseAttributeBuilder {
 
@@ -10,7 +12,8 @@ public class PrincipalNameAttributeBuilder extends BaseAttributeBuilder {
 		return PRINCIPAL_NAME_NAME;
 	}
 
-	public Attribute build(AuthenticationSession authSession) {
+	public Attribute build(AuthenticationSession authSession, 
+			OAAuthParameter oaParam, AuthenticationData authData) {
 		return buildStringAttribute(PRINCIPAL_NAME_FRIENDLY_NAME, PRINCIPAL_NAME_NAME, authSession.getIdentityLink().getFamilyName());
 	}