add first parts of interfederation configuration

1 files changed, 36 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
index 8e58f7bde..24ee653f3 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
@@ -29,26 +29,53 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.OAListElement;
+import at.gv.egovernment.moa.id.configuration.data.OAListElement.ServiceType;
 
 public class FormDataHelper {
 
-	public static ArrayList<OAListElement> addFormOAs(List<OnlineApplication> dbOAs) {
+	public static ArrayList<OAListElement> populateFormWithInderfederationIDPs(List<OnlineApplication> dbOAs) {
 		
 		ArrayList<OAListElement> formOAs = new ArrayList<OAListElement>();
 
 		for (OnlineApplication dboa : dbOAs) {
-			OAListElement listoa = new OAListElement();
-			listoa.setActive(dboa.isIsActive());
-			listoa.setDataBaseID(dboa.getHjid());
-			listoa.setOaFriendlyName(dboa.getFriendlyName());
-			listoa.setOaIdentifier(dboa.getPublicURLPrefix());
-			listoa.setOaType(dboa.getType());
-			formOAs.add(listoa);
-		}
+			
+			if (dboa.isIsInterfederationIDP()!= null && dboa.isIsInterfederationIDP())
+				formOAs.add(addOAFormListElement(dboa, ServiceType.IDP));
+			
+			else if (dboa.getAuthComponentOA().getOASTORK() != null 
+						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled() != null
+						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled())
+				formOAs.add(addOAFormListElement(dboa, ServiceType.VIDP));
+		}		
+		return formOAs;
+	}
+	
+	public static ArrayList<OAListElement> populateFormWithOAs(List<OnlineApplication> dbOAs) {
 		
+		ArrayList<OAListElement> formOAs = new ArrayList<OAListElement>();
+
+		for (OnlineApplication dboa : dbOAs) {
+			
+			if ( !((dboa.isIsInterfederationIDP() != null && dboa.isIsInterfederationIDP()) || 
+					(dboa.getAuthComponentOA().getOASTORK() != null 
+						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled() != null
+						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled()))) {
+				formOAs.add(addOAFormListElement(dboa, ServiceType.OA));
+			}
+		}		
 		return formOAs;
 	}
 	
+	private static OAListElement addOAFormListElement(OnlineApplication dboa, ServiceType type) {
+		OAListElement listoa = new OAListElement(type);
+		listoa.setActive(dboa.isIsActive());
+		listoa.setDataBaseID(dboa.getHjid());
+		listoa.setOaFriendlyName(dboa.getFriendlyName());
+		listoa.setOaIdentifier(dboa.getPublicURLPrefix());
+		listoa.setOaType(dboa.getType());
+		return listoa;
+	}
+	
 	public static ArrayList<AuthenticatedUser> addFormUsers(List<UserDatabase> dbuserlist) {
 		ArrayList<AuthenticatedUser> userlist = new ArrayList<AuthenticatedUser>();