finish first beta-version of ELGA mandate-service client-module

1 files changed, 15 insertions, 9 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
index b7e95785b..a4abbbcfa 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
@@ -78,20 +78,20 @@ public class StartAuthentificationParameterParser extends MOAIDAuthConstants{
 
 	    
 		//check UseMandate flag
-		String useMandateString = null;
-		boolean useMandateBoolean = false;
+		String useMISMandateString = null;
+		boolean useMISMandateBoolean = false;
 		if ((useMandate != null) && (useMandate.compareTo("") != 0)) {
-			useMandateString = useMandate;
+			useMISMandateString = useMandate;
 		} else {
-			useMandateString = "false";
+			useMISMandateString = "false";
 		}
 
-		if (useMandateString.compareToIgnoreCase("true") == 0)
-			useMandateBoolean = true;
+		if (useMISMandateString.compareToIgnoreCase("true") == 0)
+			useMISMandateBoolean = true;
 		else
-			useMandateBoolean = false;
+			useMISMandateBoolean = false;
 	    
-		moasession.setUseMandate(useMandateString);
+		moasession.setUseMandate(useMISMandateString);
 		
 				
 	    //load OnlineApplication configuration
@@ -155,7 +155,7 @@ public class StartAuthentificationParameterParser extends MOAIDAuthConstants{
 		} else {
 			Logger.debug("Service-Provider is of type 'PrivateService' with DomainIdentifier:" + oaParam.getIdentityLinkDomainIdentifier());
 			
-			if (useMandateBoolean) {
+			if (useMISMandateBoolean) {
 				Logger.error("Online-Mandate Mode for business application not supported.");
 				throw new AuthenticationException("auth.17", null);
 			}
@@ -213,6 +213,12 @@ public class StartAuthentificationParameterParser extends MOAIDAuthConstants{
 			protocolReq.setNeedSingleSignOnFunctionality(false);
 
 		}
+		if (protocolReq.needSingleSignOnFunctionality() && useMISMandateBoolean) {
+			Logger.info("Usage of MIS-MandateService does not allow Single Sign-On. --> SSO is disabled for this request.");
+			protocolReq.setNeedSingleSignOnFunctionality(false);
+			
+		}
+		
 	}
 	
 	public void parse(ExecutionContext ec, HttpServletRequest req,