1 files changed, 31 insertions, 37 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 18d0b479e..619935abe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -44,61 +44,55 @@ public class AuthenticationRequest implements IAction {
 
             Logger.debug("Entering MOASTORKRequest");
             httpResp.reset();
+            
+            OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+            if (oaParam == null)
+                throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
 
+            MOASTORKResponse moaStorkResponse = new MOASTORKResponse();
+            
             // check if it is attribute query
             if (moaStorkRequest.isAttrRequest()) {
                 Logger.debug("Starting AttrQueryRequest");
-                STORKAttrQueryResponse attrResponse = new STORKAttrQueryResponse();
-                IPersonalAttributeList personalAttributeList = moaStorkRequest.getStorkAttrQueryRequest().getPersonalAttributeList();
-
-                // TODO Check if this instance is eligible to fetch attributes locally, assuming yes
-
-                return (new AttributeCollector()).processRequest(req, httpReq, httpResp, moasession);
-
-            } else
-                // check if we have authentication request
-                if (moaStorkRequest.isAuthnRequest()) {
-                    Logger.debug("Starting AuthenticationRequest");
-
-                    STORKAuthnResponse authnResponse = new STORKAuthnResponse();
-                    authnResponse.setCountry(moaStorkRequest.getStorkAuthnRequest().getSpCountry());
-
-                    OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
-                    if (oaParam == null)
-                        throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
-
-                    // Get personal attributtes from MOA/IdentityLink
-                    authnResponse.setPersonalAttributeList(populateAttributes());
+                
+                moaStorkResponse.setSTORKAttrResponse(new STORKAttrQueryResponse());
+            }
+            // check if we have authentication request
+            else if (moaStorkRequest.isAuthnRequest()) {
+                Logger.debug("Starting AuthenticationRequest");
 
-                    // Prepare extended attributes
-                    Logger.debug("Preparing data container");
+                moaStorkResponse.setSTORKAuthnResponse(new STORKAuthnResponse());
+                // Get personal attributtes from MOA/IdentityLink
+                moaStorkResponse.setPersonalAttributeList(populateAttributes());
+            }
+            
+            moaStorkResponse.setCountry(moaStorkRequest.getSpCountry());
 
-                    // create fresh container
-                    DataContainer container = new DataContainer();
+            // Prepare extended attributes
+            Logger.debug("Preparing data container");
 
-                    // - fill in the request we extracted above
-                    container.setRequest(moaStorkRequest.getStorkAuthnRequest());
+            // create fresh container
+            DataContainer container = new DataContainer();
 
-                    // - fill in the partial response created above
-                    container.setResponse(authnResponse);
+            // - fill in the request we extracted above
+            container.setRequest(moaStorkRequest);
 
-                    // - memorize the target url were we have to return the result
-                    container.setTarget(moaStorkRequest.getStorkAuthnRequest().getAssertionConsumerServiceURL());
+            // - fill in the partial response created above
+            container.setResponse(moaStorkResponse);
 
-                    container.setRemoteAddress(httpReq.getRemoteAddr());
+            // - memorize the target url were we have to return the result
+            container.setTarget(moaStorkRequest.getAssertionConsumerServiceURL());
 
+            container.setRemoteAddress(httpReq.getRemoteAddr());
 
-                    Logger.debug("Data container prepared");
 
-                    return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
+            Logger.debug("Data container prepared");
 
-                }
+            return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
         } else {
             Logger.error("Could not recognize request.");
             throw new MOAIDException("stork.15", null);
         }
-
-        return null;
     }
 
     public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {