RSCH

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 7 insertions, 5 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolver.java
index 3f7a6872c..3958bb206 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolver.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolver.java
@@ -184,7 +184,7 @@ public class XMLLoginParameterResolver implements LoginParameterResolver {
     String famName = resolveValue("MOAFamilyName", authData, clientIPAddress);
     String givenName = resolveValue("MOAGivenName", authData, clientIPAddress);
     String dateOfBirth = resolveValue("MOADateOfBirth", authData, clientIPAddress);
-    String bPK = resolveValue("MOAVPK", authData, clientIPAddress);
+    String bPK = resolveValue("MOABPK", authData, clientIPAddress);
     String userid = "";
     String password = "";
     LPRParams params = null;
@@ -247,7 +247,7 @@ public class XMLLoginParameterResolver implements LoginParameterResolver {
       String famName = resolveValue("MOAFamilyName", authData, clientIPAddress);
       String givenName = resolveValue("MOAGivenName", authData, clientIPAddress);
       String dateOfBirth = resolveValue("MOADateOfBirth", authData, clientIPAddress);
-      String bPK = resolveValue("MOAVPK", authData, clientIPAddress);
+      String bPK = resolveValue("MOABPK", authData, clientIPAddress);
       String userid = "";
       String password = "";
       LPRParams params = null;
@@ -293,8 +293,8 @@ public class XMLLoginParameterResolver implements LoginParameterResolver {
       return authData.getFamilyName();
     if (predicate.equals("MOADateOfBirth"))
       return authData.getDateOfBirth();
-    if (predicate.equals("MOAVPK"))
-      return authData.getVPK();
+    if (predicate.equals("MOABPK"))
+      return authData.getPBK();
     if (predicate.equals("MOAPublicAuthority"))
       if (authData.isPublicAuthority())
         return "true";
@@ -307,8 +307,10 @@ public class XMLLoginParameterResolver implements LoginParameterResolver {
         return "true";
       else
         return "false";
-    if (predicate.equals("MOAZMRZahl"))
+    if (predicate.equals("MOAStammzahl"))
       return authData.getIdentificationValue();
+		if (predicate.equals(MOAIdentificationValueType))
+			return authData.getIdentificationType();   
     if (predicate.equals("MOAIPAddress"))
       return clientIPAddress;
     else