1 files changed, 25 insertions, 5 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 b9f01ca9f..307715324 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
@@ -6,6 +6,9 @@ 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.dao.config.AttributeProviderPlugin;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
+import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 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;
@@ -174,14 +177,31 @@ public class AttributeCollector implements IAction {
 				currentAttribute.setStatus("notAvailable");
 				aquiredAttributes.add((PersonalAttribute) currentAttribute.clone());
 				addOrUpdateAll(container.getResponse().getPersonalAttributeList(), aquiredAttributes);
-
             	// - check if we can find a suitable AttributeProvider Plugin
+
                 for (AttributeProvider currentProvider : AttributeProviderFactory.getConfiguredPlugins(oaParam.getStorkAPs())) {
+
+                    // build a section of attribute provider's predefined attributes and missing attributes
+                    // only missing attributes that can be handled by attribute provider will be sent to it
+                    List<PersonalAttribute> currentProviderConfiguredAttributes = new ArrayList<PersonalAttribute>();
+                    for (String attributeName : currentProvider.getSupportedAttributeNames())  {
+                        for (PersonalAttribute missingAttribute : missingAttributes) {
+                            if (missingAttribute.getName().equals(attributeName)) {
+                                currentProviderConfiguredAttributes.add(missingAttribute);
+                                break;
+                            }
+                        }
+                    }
+
                     try {
                         // - hand over control to the suitable plugin
                     	Logger.info(currentProvider.getClass().getSimpleName() + " called to handle attribute '" + currentAttribute.getName() + "'");
-                        aquiredAttributes = currentProvider.acquire(currentAttribute, container.getRequest().getSpCountry(), authData);
-                    	Logger.info(currentProvider.getClass().getSimpleName() + " can handle attribute '" + currentAttribute.getName() + "'");
+
+                        //aquiredAttributes = currentProvider.acquire(currentAttribute, container.getRequest().getSpCountry(), moasession);
+                        //aquiredAttributes = currentProvider.acquire(missingAttributes, container.getRequest().getSpCountry(), moasession);
+                        aquiredAttributes = currentProvider.acquire(currentProviderConfiguredAttributes, container.getRequest().getSpCountry(), authData);
+
+                        Logger.info(currentProvider.getClass().getSimpleName() + " can handle attribute '" + currentAttribute.getName() + "'");
                         break;
                     } catch (UnsupportedAttributeException e) {
                         // ok, try the next attributeprovider
@@ -251,7 +271,7 @@ public class AttributeCollector implements IAction {
 	private void addOrUpdateAll(IPersonalAttributeList target, IPersonalAttributeList source) throws MOAIDException {
 		Logger.debug("Updating " + source.size() + " attributes...");
 		for (PersonalAttribute current : source) {
-			Logger.trace("treating " + current.getName());
+			Logger.debug("treating " + current.getName());
 	        
 			// check if we need to update the current pa
 			if (target.containsKey(current.getName())) {
@@ -268,7 +288,7 @@ public class AttributeCollector implements IAction {
 			} else
 				target.add(current);
 
-			Logger.trace("...successfully treated " + current.getName());
+			Logger.debug("...successfully treated " + current.getName());
 		}
 	}