1 files changed, 32 insertions, 6 deletions

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 bbb610d62..49e013fe0 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
@@ -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_.IdentificationType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.PhysicalPersonType;
+import at.gv.egovernment.moa.id.BuildException;
+import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
 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;
@@ -13,6 +15,7 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailabl
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Constants;
 
 public class MandateNaturalPersonBPKAttributeBuilder extends BaseAttributeBuilder {
 
@@ -39,17 +42,40 @@ public class MandateNaturalPersonBPKAttributeBuilder extends BaseAttributeBuilde
 			}
 			IdentificationType id = null;
 			id = physicalPerson.getIdentification().get(0);
-			/*if(authSession.getBusinessService()) {
-				id = MandateBuilder.getWBPKIdentification(physicalPerson);
-			} else {
-				id = MandateBuilder.getBPKIdentification(physicalPerson);
-			}*/
+//			if(authSession.getBusinessService()) {
+//				id = MandateBuilder.getWBPKIdentification(physicalPerson);
+//			} else {
+//				id = MandateBuilder.getBPKIdentification(physicalPerson);
+//			}
 			if(id == null) {
 				Logger.error("Failed to generate IdentificationType");
 				throw new NoMandateDataAvailableException();
 			}
+			
+			String bpk;
+			try {
+			
+				if (id.getType().equals(Constants.URN_PREFIX_BASEID)) {
+					if (authSession.getBusinessService()) {						    
+						bpk = new BPKBuilder().buildWBPK(id.getValue().getValue(), oaParam.getIdentityLinkDomainIdentifier());
+						
+					}
+					
+					else {
+						bpk = new BPKBuilder().buildBPK(id.getValue().getValue(), oaParam.getTarget());
+						
+					}
+								
+				} else 
+					bpk = id.getValue().getValue();
+				
+			} catch (BuildException e ){
+				Logger.error("Failed to generate IdentificationType");
+				throw new NoMandateDataAvailableException();
+			}
+		
 			return buildStringAttribute(MANDATE_NAT_PER_BPK_FRIENDLY_NAME, 
-					MANDATE_NAT_PER_BPK_NAME, id.getValue().getValue());
+					MANDATE_NAT_PER_BPK_NAME, bpk);
 		}
 		return null;