1 files changed, 20 insertions, 10 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 27a2f3050..c4ab80c66 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
@@ -24,15 +24,11 @@
 
 package at.gv.egovernment.moa.id.auth;
 
-import iaik.ixsil.exceptions.UtilsException;
-import iaik.ixsil.util.Utils;
 import iaik.pki.PKIException;
 import iaik.x509.X509Certificate;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.Principal;
@@ -324,6 +320,20 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     String scheme)
     throws WrongParametersException, AuthenticationException, ConfigurationException, BuildException {
 
+	  String useMandateString = null;
+	  boolean useMandateBoolean = false;
+	  if ((useMandate != null) && (useMandate.compareTo("") != 0)) {
+		  	useMandateString = useMandate;
+	    }
+	    else {
+	    	useMandateString = "false";
+	    }
+	  
+	  if (useMandateString.compareToIgnoreCase("true") == 0)
+		  useMandateBoolean = true;
+	  else
+		  useMandateBoolean = false;
+	  
     if (isEmpty(sessionID)) {
       if (isEmpty(authURL))
         throw new WrongParametersException("StartAuthentication", "AuthURL", "auth.05");
@@ -353,6 +363,10 @@ public class AuthenticationServer implements MOAIDAuthConstants {
         if (isEmpty(target))
           throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.05");
       } else {
+    	if (useMandateBoolean) {
+    		Logger.error("Online-Mandate Mode for bussines application not supported.");
+			throw new AuthenticationException("auth.17", null);
+    	}
         target = null;
         targetFriendlyName = null;
       }
@@ -376,17 +390,13 @@ public class AuthenticationServer implements MOAIDAuthConstants {
     }
     session.setBkuURL(bkuURL);
     session.setDomainIdentifier(oaParam.getIdentityLinkDomainIdentifier());
+    session.setUseMandate(useMandateString);
     String infoboxReadRequest = 
       new InfoboxReadRequestBuilder().build(oaParam.getSlVersion12(), 
                                             oaParam.getBusinessService(),     
                                             oaParam.getIdentityLinkDomainIdentifier());
     
-    if ((useMandate != null) && (useMandate.compareTo("") != 0)) {
-    	session.setUseMandate(useMandate);
-    }
-    else {
-    	session.setUseMandate("false");
-    }
+    
     String dataURL =
       new DataURLBuilder().buildDataURL(
         session.getAuthURL(),