1 files changed, 46 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 98bc0197f..d48054e4b 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
@@ -24,10 +24,21 @@
 
 package at.gv.egovernment.moa.id.auth.builder;
 
+import java.io.StringWriter;
 import java.text.MessageFormat;
 import java.util.List;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 
 import at.gv.egovernment.moa.id.BuildException;
 import at.gv.egovernment.moa.id.ParseException;
@@ -143,7 +154,8 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
     String oaURL, 
     String gebDat,
     List extendedSAMLAttributes,
-    AuthenticationSession session)
+    AuthenticationSession session, 
+    boolean fromMandate)
   throws BuildException
   {
     session.setSAMLAttributeGebeORwbpk(true);
@@ -197,12 +209,21 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
          Logger.error("Error on building AUTH-Block: " + e.getMessage());
           throw new BuildException("builder.00", new Object[] { "AUTH-Block", e.toString()});
       } 
-      ExtendedSAMLAttribute bpkAttribute = 
-          new ExtendedSAMLAttributeImpl("bPK", bpkSamlValueElement, Constants.MOA_NS_URI, ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY);
       
-      System.out.println("extendedSAMLAttributes: " + extendedSAMLAttributes.size());
+//      String s = xmlToString(bpkSamlValueElement);
+//      System.out.println("bpkSamlValueElement: " + s);
+      
+      
+      if (!fromMandate) {
+    	  ExtendedSAMLAttribute bpkAttribute = 
+    		  new ExtendedSAMLAttributeImpl("bPK", bpkSamlValueElement, Constants.MOA_NS_URI, ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY);
+      
+    	  //System.out.println("extendedSAMLAttributes: " + extendedSAMLAttributes.size());
+      
+    	  extendedSAMLAttributes.add(bpkAttribute);
+      }  
+    	
       
-     extendedSAMLAttributes.add(bpkAttribute);
 
      //gebeORwbpk = gebeORwbpk  + MessageFormat.format(BPK_ATTRIBUTE, new Object[] { identityLinkValue, identityLinkType });
      wbpkNSDeclaration = " xmlns:pr=\"" + PD_NS_URI + "\"";
@@ -332,6 +353,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
          Logger.error("Error on building AUTH-Block: " + e.getMessage());
           throw new BuildException("builder.00", new Object[] { "AUTH-Block", e.toString()});
       } 
+            
       ExtendedSAMLAttribute bpkAttribute = 
           new ExtendedSAMLAttributeImpl("bPK", bpkSamlValueElement, Constants.MOA_NS_URI, ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY);
          
@@ -370,5 +392,23 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion
     return assertion;
     
   }
-
+  
+  
+  public static String xmlToString(Node node) {
+      try {
+          Source source = new DOMSource(node);
+          StringWriter stringWriter = new StringWriter();
+          Result result = new StreamResult(stringWriter);
+          TransformerFactory factory = TransformerFactory.newInstance();
+          Transformer transformer = factory.newTransformer();
+          transformer.transform(source, result);
+          return stringWriter.getBuffer().toString();
+      } catch (TransformerConfigurationException e) {
+          e.printStackTrace();
+      } catch (TransformerException e) {
+          e.printStackTrace();
+      }
+      return null;
+  }
+  
 }