copied changes from "set correct target type element" to PEPSConnectorWithLocalSigningServlet

1 files changed, 14 insertions, 15 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java
index dfb2753ec..129494cbe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorWithLocalSigningServlet.java
@@ -213,7 +213,7 @@ public class PEPSConnectorWithLocalSigningServlet extends AuthServlet {
 				PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values,
 						"Available");
 				personalAttributeList.add(signedDocAttribute);
-				
+
 				String authnContextClassRef = moaSession.getAuthnContextClassRef();
 				SZRGInsertion(moaSession, personalAttributeList, authnContextClassRef);
 			} catch (STORKException e) {
@@ -646,19 +646,18 @@ public class PEPSConnectorWithLocalSigningServlet extends AuthServlet {
 
 		// retrieve target
 		//TODO: check in case of SSO!!!
-		String targetType = null;
-		String targetValue = null;
-		if(oaParam.getBusinessService()) {
-			String id = oaParam.getIdentityLinkDomainIdentifier();
-			if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_))
-				targetValue = id.substring(AuthenticationSession.REGISTERANDORDNR_PREFIX_.length());
-			else
-				targetValue = moaSession.getDomainIdentifier();
-			targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_;
-		} else {
-			targetType = AuthenticationSession.TARGET_PREFIX_;
-			targetValue = oaParam.getTarget();
-		}
+        String targetType = null;
+        if(oaParam.getBusinessService()) {
+        	String id = oaParam.getIdentityLinkDomainIdentifier();
+        	if (id.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_))
+        		targetType = id;
+        	else
+        		targetType = AuthenticationSession.REGISTERANDORDNR_PREFIX_ + moaSession.getDomainIdentifier();
+        } else {
+        	targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget();
+        }
+        
+		
 
 		Logger.debug("Starting connecting SZR Gateway");
 		//contact SZR Gateway
@@ -666,7 +665,7 @@ public class PEPSConnectorWithLocalSigningServlet extends AuthServlet {
 
 		identityLink = STORKResponseProcessor.connectToSZRGateway(personalAttributeList,
 				oaParam.getFriendlyName(), 
-				targetType, targetValue, 
+				targetType, null, 
 				oaParam.getMandateProfiles());
 		Logger.debug("SZR communication was successfull");