From 1515b8322397681ec1f8b9ba543e4669cd262534 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 25 Feb 2014 13:46:46 +0100
Subject: remove unused elements from Security-Layer request

---
 .../auth/builder/GetIdentityLinkFormBuilder.java   | 38 ++++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index e4af58342..c09cde787 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -72,10 +72,10 @@ public class GetIdentityLinkFormBuilder extends Builder {
   private static final String XMLREQUEST_TAG = "<XMLRequest>";
   /** special tag in the HTML template to be substituted for the data URL */
   private static final String DATAURL_TAG = "<DataURL>";
-  /** special tag in the HTML template to be substituted for certificate info XML request */
-  private static final String CERTINFO_XMLREQUEST_TAG = "<CertInfoXMLRequest>";
-  /** special tag in the HTML template to be substituted for the certificate info data URL */
-  private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
+//  /** special tag in the HTML template to be substituted for certificate info XML request */
+//  private static final String CERTINFO_XMLREQUEST_TAG = "<CertInfoXMLRequest>";
+//  /** special tag in the HTML template to be substituted for the certificate info data URL */
+//  private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
   /** special tag in the HTML template to be substituted for the infoboxes to be pushed from the BKU */
   private static final String PUSHINFOBOX_TAG = "<PushInfobox>";
   /** special tag in the HTML template to be substituted for the BKU URL */
@@ -109,18 +109,18 @@ public class GetIdentityLinkFormBuilder extends Builder {
     "         value=\"" + PUSHINFOBOX_TAG + "\"/>" + nl +
     "  <input type=\"submit\" value=\"Anmeldung mit B&uuml;rgerkarte\"/>" + nl +
     "</form>" + nl +
-    "<form name=\"CertificateInfoForm\"" + nl +
-    "      action=\"" + BKU_TAG + "\"" + nl +
-    "      method=\"post\">" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"XMLRequest\"" + nl +
-    "         value=\"" + CERTINFO_XMLREQUEST_TAG + "\"/>" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"DataURL\"" + nl +
-    "         value=\"" + CERTINFO_DATAURL_TAG + "\"/>" + nl +
-//	"  <input type=\"submit\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +    
-    "  <input type=\"hidden\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +
-    "</form>" + nl +
+//    "<form name=\"CertificateInfoForm\"" + nl +
+//    "      action=\"" + BKU_TAG + "\"" + nl +
+//    "      method=\"post\">" + nl +
+//    "  <input type=\"hidden\" " + nl +
+//    "         name=\"XMLRequest\"" + nl +
+//    "         value=\"" + CERTINFO_XMLREQUEST_TAG + "\"/>" + nl +
+//    "  <input type=\"hidden\" " + nl +
+//    "         name=\"DataURL\"" + nl +
+//    "         value=\"" + CERTINFO_DATAURL_TAG + "\"/>" + nl +
+////	"  <input type=\"submit\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +    
+//    "  <input type=\"hidden\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +
+//    "</form>" + nl +
     "</body>" + nl +
     "</html>";
   
@@ -164,8 +164,10 @@ public class GetIdentityLinkFormBuilder extends Builder {
     htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL, true, ALL);
     htmlForm = replaceTag(htmlForm, PUSHINFOBOX_TAG, pushInfobox, false, ALL);
 //new:wird oben mitreplaced    htmlForm = replaceTag(htmlForm, BKU_TAG, bkuURL);
-    htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest), true, ALL);
-    htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL, true, ALL);
+    
+    //removed in MOA-ID 2.0
+//    htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest), true, ALL);
+//    htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL, true, ALL);
     
     Map<String, String> map = null;
     
-- 
cgit v1.2.3