From 56ed4518d7978c064af5f240494bf587136c93b0 Mon Sep 17 00:00:00 2001
From: rudolf <rudolf@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 15 Mar 2004 16:07:52 +0000
Subject: RSCH

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../proxy/parser/AuthenticationDataAssertionParser.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java')

diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java b/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
index ce0743b3d..a78a8d587 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/parser/AuthenticationDataAssertionParser.java
@@ -40,7 +40,7 @@ public class AuthenticationDataAssertionParser implements Constants {
   private static String ATTRIBUTESTATEMENT_XPATH =
     SAML + "AttributeStatement/";
   /** Prefix for Element NameIdentifier in an Xpath-expression */    
-  private static String VPK_XPATH =
+  private static String BPK_XPATH =
     ATTRIBUTESTATEMENT_XPATH +
     SAML + "Subject/" +
     SAML + "NameIdentifier";
@@ -51,10 +51,15 @@ public class AuthenticationDataAssertionParser implements Constants {
     SAML + "AttributeValue/" +
     PR + "Person/";
   /** Prefix for Element Value in an Xpath-expression */    
-  private static String ZMRZAHL_XPATH =
+  private static String IDENTIFICATION_VALUE_XPATH =
     PERSONDATA_XPATH +
     PR + "Identification/" +
     PR + "Value";
+	private static String IDENTIFICATION_TYPE_XPATH =
+		PERSONDATA_XPATH +
+		PR + "Identification/" +
+		PR + "Type";
+
   /** Prefix for Element GivenName in an Xpath-expression */     
   private static String GIVEN_NAME_XPATH =
     PERSONDATA_XPATH +
@@ -112,10 +117,12 @@ public class AuthenticationDataAssertionParser implements Constants {
         XPathUtils.getAttributeValue(samlAssertion, ISSUER_XPATH, ""));
       authData.setIssueInstant(
         XPathUtils.getAttributeValue(samlAssertion, ISSUE_INSTANT_XPATH, ""));
-      authData.setVPK(
-        XPathUtils.getElementValue(samlAssertion, VPK_XPATH, ""));
+      authData.setPBK(
+        XPathUtils.getElementValue(samlAssertion, BPK_XPATH, ""));
       authData.setIdentificationValue(
-        XPathUtils.getElementValue(samlAssertion, ZMRZAHL_XPATH, ""));
+        XPathUtils.getElementValue(samlAssertion, IDENTIFICATION_VALUE_XPATH, ""));
+      authData.setIdentificationType(
+				XPathUtils.getElementValue(samlAssertion, IDENTIFICATION_TYPE_XPATH, ""));
       authData.setGivenName(
         XPathUtils.getElementValue(samlAssertion, GIVEN_NAME_XPATH, ""));
       authData.setFamilyName(
-- 
cgit v1.2.3