Refined Eclipse WTP settings; changed standard configuration

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

1 files changed, 13 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index bac66eeab..caeff905b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -265,7 +265,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
    * @param oaURL online application URL requested
    * @param bkuURL URL of the "Bürgerkartenumgebung" to be used; 
    *                may be <code>null</code>; in this case, the default location will be used
-   * @param templateURL URL providing an HTML template for the HTML form generated 
+   * @param templateURL URL providing an HTML template for the HTML form generated
+   * @param scheme determines the protocol used 
    * @return HTML form
    * @throws AuthenticationException
    * @see GetIdentityLinkFormBuilder
@@ -277,7 +278,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     String oaURL,
     String templateURL,
     String bkuURL,
-    String sessionID)
+    String sessionID,
+    String scheme)
     throws WrongParametersException, AuthenticationException, ConfigurationException, BuildException {
 
     if (isEmpty(sessionID)) {
@@ -322,7 +324,11 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     }
     // BKU URL has not been set yet, even if session already exists
     if (bkuURL == null) {
-      bkuURL = DEFAULT_BKU;
+      if (scheme!=null && scheme.equalsIgnoreCase("https")) {
+        bkuURL = DEFAULT_BKU_HTTPS;
+      } else {
+        bkuURL = DEFAULT_BKU;
+      }
     }
     session.setBkuURL(bkuURL);
     session.setDomainIdentifier(oaParam.getIdentityLinkDomainIdentifier());
@@ -602,6 +608,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
               }
               // check for party representation in mandates infobox
               if (Constants.INFOBOXIDENTIFIER_MANDATES.equalsIgnoreCase(identifier) && !((infoboxTokenList == null || infoboxTokenList.size() == 0))){
+                //We need app specific parameters
+                if (null==verifyInfoboxParameter.getApplicationSpecificParams()) {
+                  throw new ValidateException("validator.66", new Object[] {friendlyName});
+                }
                 session.setMandateCompatibilityMode(ParepConfiguration.isMandateCompatibilityMode(verifyInfoboxParameter.getApplicationSpecificParams()));
                 Element mandate = ParepValidator.extractPrimaryToken(infoboxTokenList);
                 //ParepUtils.serializeElement(mandate, System.out);