add AuthBlockText keyword #BIRTHDAY#

2 files changed, 7 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
index db9bc588f..30ad0bdc9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
@@ -272,7 +272,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
 	}
     
    	String specialText =  MessageFormat.format(SPECIAL_TEXT_ATTRIBUTE, 
-   			new Object[] { generateSpecialText(text, issuer, issueInstant) });
+   			new Object[] { generateSpecialText(text, issuer, gebDat, issueInstant) });
     
    	//generate unique AuthBlock tokken
    	String uniquetokken = Random.nextRandom();
@@ -424,7 +424,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
 	}
     
    	String specialText =  MessageFormat.format(SPECIAL_TEXT_ATTRIBUTE, 
-   			new Object[] { generateSpecialText(text, issuer, issueInstant) });
+   			new Object[] { generateSpecialText(text, issuer, gebDat, issueInstant) });
     
    	//generate unique AuthBlock tokken
    	String uniquetokken = Random.nextRandom();
@@ -454,12 +454,13 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
     
   }
   
-  public static String generateSpecialText(String inputtext, String issuer, String issueInstant) {
+  public static String generateSpecialText(String inputtext, String issuer, String gebDat, String issueInstant) {
 	   	Calendar datetime = DatatypeConverter.parseDateTime(issueInstant);
 	   	SimpleDateFormat dateformat = new SimpleDateFormat("dd.MM.yyyy");
 	   	SimpleDateFormat timeformat = new SimpleDateFormat("HH:mm:ss");
 	 
 	   	String text = inputtext.replaceAll("#NAME#", issuer);
+	    text = text.replaceAll("#BIRTHDAY#", gebDat);
 	   	text = text.replaceAll("#DATE#", dateformat.format(datetime.getTime()));
 	   	text = text.replaceAll("#TIME#", timeformat.format(datetime.getTime()));
 	   	
@@ -536,7 +537,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
 		    if (MiscUtil.isEmpty(text))
 		    	text="";
 		   	String specialText =  MessageFormat.format(SPECIAL_TEXT_ATTRIBUTE, 
-		   			new Object[] { generateSpecialText(text, issuer, issueInstant) });
+		   			new Object[] { generateSpecialText(text, issuer, gebDat, issueInstant) });
 	
 		   	//generate unique AuthBlock tokken
 		   	String uniquetokken = Random.nextRandom();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
index b2c47fac0..762d9af2c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
@@ -299,7 +299,7 @@ public class CreateXMLSignatureResponseValidator {
 	}
       
       
-      String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, issueInstant);
+      String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, identityLink.getDateOfBirth(), issueInstant);
       if (!samlSpecialText.equals(specialText)) {
         throw new ValidateException("validator.67", new Object[] {samlSpecialText, specialText});
       }
@@ -528,7 +528,7 @@ public class CreateXMLSignatureResponseValidator {
 	}
       
       
-      String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, issueInstant);
+      String specialText = AuthenticationBlockAssertionBuilder.generateSpecialText(text, issuer, identityLink.getDateOfBirth(), issueInstant);
       if (!samlSpecialText.equals(specialText)) {
         throw new ValidateException("validator.67", new Object[] {samlSpecialText, specialText});
       }