updated for wbPK

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

1 files changed, 72 insertions, 24 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
index 41f439d04..ec412deb3 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
@@ -12,26 +12,39 @@ import at.gv.egovernment.moa.util.Constants;
  * @version $Id$
  */
 public class AuthenticationBlockAssertionBuilder implements Constants {
-  /** private static String nl contains the NewLine representation in Java*/
+  /** the NewLine representation in Java*/
 	private static String nl = "\n";
-  /** private static String AUTH_BLOCK contains an XML-Auth-Block-Template */
+  /** template for the Auth-Block */
   private static String AUTH_BLOCK = 
-  	"<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{0}'' IssueInstant=''{1}''>" + nl +
-  	"	<saml:AttributeStatement>" + nl +
-		"		<saml:Subject>" + nl +
-		"			<saml:NameIdentifier>{2}</saml:NameIdentifier>" + nl +
-	  "		</saml:Subject>" + nl +
-	  "		<saml:Attribute AttributeName=''Geschaeftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{3}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "		<saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{4}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-   	"		<saml:Attribute AttributeName=''Geburtsdatum'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{5}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "	</saml:AttributeStatement>" + nl +
-		"</saml:Assertion>";
+    "<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "''{0} MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{1}'' IssueInstant=''{2}''>" + nl +
+    " <saml:AttributeStatement>" + nl +
+    "   <saml:Subject>" + nl +
+    "     <saml:NameIdentifier>{3}</saml:NameIdentifier>" + nl +
+    "   </saml:Subject>" + nl +
+    "{4}" + 
+    "   <saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{5}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl +
+    "   <saml:Attribute AttributeName=''Geburtsdatum'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{6}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl +
+    " </saml:AttributeStatement>" + nl +
+    "</saml:Assertion>";
+  
+  private static String GESCHAEFTS_BEREICH_ATTRIBUTE =
+    "   <saml:Attribute AttributeName=''Geschaeftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>{0}</saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl;
+  
+  private static String WBPK_ATTRIBUTE =
+    "   <saml:Attribute AttributeName=''wbPK'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
+    "     <saml:AttributeValue>" + nl +
+    "       <pr:Identification>" + nl +
+    "         <pr:Value>{0}</pr:Value>" + nl +
+    "         <pr:Type>{1}</pr:Type>" + nl +
+    "       </pr:Identification>" + nl +
+    "     </saml:AttributeValue>" + nl +
+    "   </saml:Attribute>" + nl;
 
   /**
    * Constructor for AuthenticationBlockAssertionBuilder.
@@ -39,21 +52,56 @@ public class AuthenticationBlockAssertionBuilder implements Constants {
   public AuthenticationBlockAssertionBuilder() {
     super();
   }
+  
   /**
-   * Builds the authentication block <code>&lt;saml:Assertion&gt;</code>.
+   * Builds the authentication block <code>&lt;saml:Assertion&gt;</code> 
    * 
    * @param issuer authentication block issuer; <code>"GivenName FamilyName"</code>
    * @param issueInstant current timestamp
    * @param authURL URL of MOA-ID authentication component
-   * @param target "Gesch&auml;ftsbereich"
+   * @param target "Gesch&auml;ftsbereich"; maybe <code>null</code> if the application
+   *               is a business application
+   * @param identityLinkValue the content of the <code>&lt;pr:Value&gt;</code>
+   *                          child element of the <code>&lt;pr:Identification&gt;</code>
+   *                          element derived from the Identitylink; this is the
+   *                          value of the <code>wbPK</code>;
+   *                          maybe <code>null</code> if the application is a public service
+   * @param identiyLinkType   the content of the <code>&lt;pr:Type&gt;</code>
+   *                          child element of the <code>&lt;pr:Identification&gt;</code>
+   *                          element derived from the Identitylink; this includes the
+   *                          URN prefix and the identification number of the business
+   *                          application used as input for wbPK computation;
+   *                          maybe <code>null</code> if the application is a public service
    * @param oaURL public URL of online application requested
    * @return String representation of authentication block 
    *          <code>&lt;saml:Assertion&gt;</code> built
    */
-  public String build(String issuer, String issueInstant, String authURL, String target, String oaURL, String GebDat) {
-  	String assertion = MessageFormat.format(
-  		AUTH_BLOCK, new Object[] { issuer, issueInstant, authURL, target, oaURL, GebDat});
-	  return assertion;
+  public String buildAuthBlock(String issuer, 
+                                String issueInstant, 
+                                String authURL, 
+                                String target,
+                                String identityLinkValue, 
+                                String identityLinkType,
+                                String oaURL, 
+                                String GebDat) 
+  {
+    
+    String gebeORwbpk = "";
+    String wbpkNSDeclaration = "";
+    if (target == null) {
+      // OA is a business application
+      gebeORwbpk =  MessageFormat.format(
+        WBPK_ATTRIBUTE, new Object[] { identityLinkValue, identityLinkType });
+      wbpkNSDeclaration = " xmlns:pr=\"" + PD_NS_URI + "\" xmlns:si=\"" + PD_NS_URI + "\"";
+    } else {
+      gebeORwbpk =  MessageFormat.format(
+        GESCHAEFTS_BEREICH_ATTRIBUTE, new Object[] { target });
+    }
+    
+    String assertion = MessageFormat.format(
+      AUTH_BLOCK, new Object[] { wbpkNSDeclaration, issuer, issueInstant, authURL, gebeORwbpk, oaURL, GebDat});
+    return assertion;
+    
   }
 
 }