1 files changed, 10 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
index f2aca057a..1589f1440 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
@@ -130,7 +130,7 @@ public class AuthenticationDataAssertionParser implements Constants {
       
     try {
       AuthenticationData authData = new AuthenticationData();
-      //ÄNDERN: NUR der Identification-Teil
+      //ÄNDERN: NUR der Identification-Teil
       authData.setSamlAssertion(DOMUtils.serializeNode(samlAssertion));
       authData.setMajorVersion(new Integer(
         XPathUtils.getAttributeValue(samlAssertion, MAJOR_VERSION_XPATH, "-1")).intValue());
@@ -143,10 +143,17 @@ public class AuthenticationDataAssertionParser implements Constants {
       authData.setIssueInstant(
         XPathUtils.getAttributeValue(samlAssertion, ISSUE_INSTANT_XPATH, ""));
       String pkValue = XPathUtils.getElementValue(samlAssertion, PK_XPATH, "");
+      
+      
+      //TODO: set pBK and Type
       if (XPathUtils.getAttributeValue(samlAssertion, NAME_QUALIFIER_XPATH, "").equalsIgnoreCase(URN_PREFIX_BPK)) {
-        authData.setBPK(pkValue);
+    	//bPK  
+        authData.setBPK(Constants.URN_PREFIX_BPK);
+        
       } else {
-        authData.setWBPK(pkValue);
+    	//wbPK
+        authData.setBPK(pkValue);
+        authData.setBPKType(XPathUtils.getElementValue(samlAssertion, IDENTIFICATION_TYPE_XPATH, ""));
       }
       authData.setIdentificationValue(
         XPathUtils.getElementValue(samlAssertion, IDENTIFICATION_VALUE_XPATH, ""));