1 files changed, 14 insertions, 19 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
index 8ccaa35de..32a8cb9c5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -4,8 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.storage.AssertionStorage;
@@ -33,32 +36,24 @@ public class AttributeCollector implements IAction {
 	/** The Constant ARTIFACT_ID. */
 	private static final String ARTIFACT_ID = "artifactId";
 	
-	private ArrayList<AttributeProvider> attributeProviders;
-
 	/** The return url. */
 	// TODO find correct return URL
 	// HTTPUtils.getBaseURL(req);
 	private String returnUrl = "findCorrectReturnURL";
 
-	public AttributeCollector() {
-		// TODO generate from config
-		attributeProviders = new ArrayList<AttributeProvider>();
-		attributeProviders.add(new StorkAttributeRequestProvider());
-		attributeProviders.add(new DemoRedirectAttributeProvider());
-		attributeProviders.add(new DemoNoRedirectAttributeProvider());
-	}
-
-
     /* (non-Javadoc)
      * @see at.gv.egovernment.moa.id.moduls.IAction#processRequest(at.gv.egovernment.moa.id.moduls.IRequest, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, at.gv.egovernment.moa.id.auth.data.AuthenticationSession)
      */
     public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
-    	// check if we have a STORKAttributeResponse in the request
-    	// - no, how did we get here?
-    	// yes, we got a recent requested attribute
-    	// - find the attribute provider plugin that can handle the response
+
+		// read configuration parameters of OA
+		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+		if (oaParam == null)
+			throw new AuthenticationException("stork.12", new Object[] { moasession.getPublicOAURLPrefix() });
+
+    	// find the attribute provider plugin that can handle the response
 		IPersonalAttributeList newAttributes = null;
-		for (AttributeProvider current : attributeProviders)
+		for (AttributeProvider current : AttributeProviderFactory.getConfiguredPlugins(oaParam.getStorkAPs()))
 			try {
 				newAttributes = current.parse(httpReq);
 			} catch (UnsupportedAttributeException e1) {
@@ -89,7 +84,7 @@ public class AttributeCollector implements IAction {
 			container.getResponse().getPersonalAttributeList().add(current);
     	
     	// see if we need some more attributes
-    	return processRequest(container, httpReq, httpResp);
+    	return processRequest(container, httpReq, httpResp, oaParam);
     }
     
     /**
@@ -100,7 +95,7 @@ public class AttributeCollector implements IAction {
      * @return the string
      * @throws MOAIDException 
      */
-    public String processRequest(DataContainer container, HttpServletRequest request, HttpServletResponse response) throws MOAIDException {
+    public String processRequest(DataContainer container, HttpServletRequest request, HttpServletResponse response, OAAuthParameter oaParam) throws MOAIDException {
     	// check if there are attributes we need to fetch
     	IPersonalAttributeList requestAttributeList = container.getRequest().getPersonalAttributeList();
     	IPersonalAttributeList responseAttributeList = container.getResponse().getPersonalAttributeList();
@@ -113,7 +108,7 @@ public class AttributeCollector implements IAction {
 	    	// for each attribute still missing
 	    	for(PersonalAttribute currentAttribute : missingAttributes) {
 	    	// - check if we can find a suitable AttributeProvider Plugin
-	    		for(AttributeProvider currentProvider : attributeProviders) {
+				for (AttributeProvider currentProvider : AttributeProviderFactory.getConfiguredPlugins(oaParam.getStorkAPs())) {
 					try {
 						// - hand over control to the suitable plugin
 						IPersonalAttributeList aquiredAttributes = currentProvider.acquire(currentAttribute);