RSCH

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

1 files changed, 9 insertions, 7 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/OldXMLLoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/OldXMLLoginParameterResolver.java
index c53ed30a6..9766ef57b 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/OldXMLLoginParameterResolver.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/OldXMLLoginParameterResolver.java
@@ -11,9 +11,9 @@ import org.w3c.dom.*;
 
 // Referenced classes of package at.gv.egovernment.moa.id.proxy:
 //						LoginParameterResolver
-// Old Implementation of XMLLoginParameterResolver (used to migrate old labs applications rapidely to 
-// version 1.1.1 of MOA-ID
-// TODO RS migrate this to XMLLoginParameterResolver
+// Old Implementation of XMLLoginParameterResolver  
+// 
+// TODO MOA-ID CIO internal: migrate this to XMLLoginParameterResolver
 
 
 public class OldXMLLoginParameterResolver
@@ -98,7 +98,7 @@ public class OldXMLLoginParameterResolver
 				{
 						String famName = resolveValue("MOAFamilyName", authData, clientIPAddress);
 						String givenName = resolveValue("MOAGivenName", authData, clientIPAddress);
-						String bPK = resolveValue("MOAVPK", authData, clientIPAddress);
+						String bPK = resolveValue("MOABPK", authData, clientIPAddress);
 						String userid = "";
 						String password = "";
 						LPRParams params = null;
@@ -193,8 +193,8 @@ public class OldXMLLoginParameterResolver
 						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";
@@ -207,8 +207,10 @@ public class OldXMLLoginParameterResolver
 								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