changig services wbkp etc

1 files changed, 9 insertions, 4 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 71d2aae37..b7afe4f8a 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
@@ -111,6 +111,7 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 	    //load OnlineApplication configuration
 	    OAAuthParameter oaParam;
 		if (moasession.getPublicOAURLPrefix() != null) {
+            Logger.debug("Loading OA parameters for PublicURLPrefix: " + moasession.getPublicOAURLPrefix());
 			oaParam = AuthConfigurationProvider.getInstance()
 					.getOnlineApplicationParameter(
 							moasession.getPublicOAURLPrefix());
@@ -136,8 +137,10 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 			    	// no target attribut is given in OA config
 			    	// target is used from request
 			    	// check parameter
-				if (!ParamValidatorUtils.isValidTarget(target))
+				if (!ParamValidatorUtils.isValidTarget(target)) {
+                    Logger.error("Selected target is invalid. Using target: " + target);
 			   		throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.12");
+                }
 				
 			} else {
 			    	// use target from config			    	
@@ -171,14 +174,14 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 
 		    moasession.setBkuURL(bkuURL);
 		    
-			if (!oaParam.getBusinessService()) {
+			if ((!oaParam.getBusinessService())&&(!oaParam.getStorkService())) {
 				if (isEmpty(target))
 					throw new WrongParametersException("StartAuthentication",
 							PARAM_TARGET, "auth.05");
 				
 			} else {
 				if (useMandateBoolean) {
-					Logger.error("Online-Mandate Mode for bussines application not supported.");
+					Logger.error("Online-Mandate Mode for business application not supported.");
 					throw new AuthenticationException("auth.17", null);
 				}
 				target = null;
@@ -189,7 +192,9 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 			
 			moasession.setTarget(target);
 			moasession.setBusinessService(oaParam.getBusinessService());
-			moasession.setTargetFriendlyName(targetFriendlyName);
+            moasession.setStorkService(oaParam.getStorkService());
+            Logger.debug("Business: " + moasession.getBusinessService() + " stork: " + moasession.getStorkService());
+            moasession.setTargetFriendlyName(targetFriendlyName);
 			moasession.setDomainIdentifier(oaParam.getIdentityLinkDomainIdentifier());
 		}