remove AttributQuery URL available check

1 files changed, 11 insertions, 11 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index ed2cd3ecb..a8a7d0c51 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -256,21 +256,18 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants {
 				
 			}
 
-			//collect attributes by using BackChannel communication
-			String endpoint = idp.getIDPAttributQueryServiceURL();			
-			if (MiscUtil.isEmpty(endpoint)) {
-				Logger.error("No AttributeQueryURL for interfederationIDP " + oaParam.getPublicURLPrefix());
-				throw new ConfigurationException("No AttributeQueryURL for interfederationIDP " + oaParam.getPublicURLPrefix(), null);
-			}
-
-			
-			//TODO: check if response include attributes and map this attributes to requested attributes
-			//TODO: insert code to parse Attributes from AuthnRespones for USP --> Zustelldienst
 			Response intfResp = (Response) req.getInterfederationResponse().getResponse();
 			AssertionAttributeExtractor extractor = 
 					new AssertionAttributeExtractor(intfResp);			
 						
-			if (!extractor.containsAllRequiredAttributes()) {			
+			if (!extractor.containsAllRequiredAttributes()) {				
+				//collect attributes by using BackChannel communication
+				String endpoint = idp.getIDPAttributQueryServiceURL();			
+				if (MiscUtil.isEmpty(endpoint)) {
+					Logger.error("No AttributeQueryURL for interfederationIDP " + oaParam.getPublicURLPrefix());
+					throw new ConfigurationException("No AttributeQueryURL for interfederationIDP " + oaParam.getPublicURLPrefix(), null);
+				}
+				
 				//build attributQuery request
 				AttributeQuery query = 
 						AttributQueryBuilder.buildAttributQueryRequest(interfIDP.getUserNameID(), endpoint, attributs);
@@ -308,6 +305,9 @@ public class AuthenticationDataBuilder implements MOAIDAuthConstants {
 				//create assertion attribute extractor from AttributeQuery response
 				extractor = new AssertionAttributeExtractor(intfResp);
 				
+			} else {
+				Logger.info("Interfedation response include all attributes with are required. Skip AttributQuery request step. ");
+				
 			}
 			//parse response information to authData
 			buildAuthDataFormInterfederationResponse(authdata, session, extractor, oaParam);