1 files changed, 26 insertions, 24 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
index b6ab357b8..7bf188e53 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
@@ -85,12 +85,35 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 			throw new MOAIDException("pvp2.13", null);
 		}
 
+		//get basic information
 		AuthnRequest authnRequest = (AuthnRequest) obj.getSamlRequest();
-		EntityDescriptor peerEntity = obj.getEntityMetadata();
+		EntityDescriptor peerEntity = obj.getEntityMetadata();		
+		SPSSODescriptor spSSODescriptor = peerEntity
+				.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
+		
+		//get AssertionConsumingService
+		Integer aIdx = authnRequest.getAssertionConsumerServiceIndex();
+		int idx = 0;
+
+		if (aIdx != null) {
+			idx = aIdx.intValue();
+			
+		} else {				
+			idx = SAML2Utils.getDefaultAssertionConsumerServiceIndex(spSSODescriptor);
+		}
+
+		AssertionConsumerService consumerService = spSSODescriptor
+				.getAssertionConsumerServices().get(idx);
+
+		if (consumerService == null) {			
+			throw new InvalidAssertionConsumerServiceException(idx);
+			
+		}
 		
 		DateTime date = new DateTime();
 		
-		Assertion assertion = PVP2AssertionBuilder.buildAssertion(authnRequest, authSession, peerEntity, date);
+		//build Assertion
+		Assertion assertion = PVP2AssertionBuilder.buildAssertion(authnRequest, authSession, peerEntity, date, consumerService);
 		
 		Response authResponse = SAML2Utils.createSAMLObject(Response.class);
 
@@ -111,28 +134,7 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 		authResponse.setIssueInstant(date);
 		
 		authResponse.setStatus(SAML2Utils.getSuccessStatus());
-
-		SPSSODescriptor spSSODescriptor = peerEntity
-				.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
-		
-		Integer aIdx = authnRequest.getAssertionConsumerServiceIndex();
-		int idx = 0;
-
-		if (aIdx != null) {
-			idx = aIdx.intValue();
-			
-		} else {				
-			idx = SAML2Utils.getDefaultAssertionConsumerServiceIndex(spSSODescriptor);
-		}
-
-		AssertionConsumerService consumerService = spSSODescriptor
-				.getAssertionConsumerServices().get(idx);
-
-		if (consumerService == null) {			
-			throw new InvalidAssertionConsumerServiceException(idx);
-			
-		}
-		
+				
 		String oaURL = consumerService.getLocation();
 
 		//check, if metadata includes an encryption key