Allow multiple alias domains

  - Every alias domain is a own EntityID which is the configured PublicURLPrefix

1 files changed, 25 insertions, 22 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
index dc3b787e4..47d7a29b3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
@@ -121,43 +121,46 @@ public class PVPConfiguration {
 		}
 	}
 	
-	public String getIDPPublicPath() throws ConfigurationException {
-		String publicPath = AuthConfigurationProviderFactory.getInstance().getPublicURLPrefix();
-		if(publicPath != null) {
-			if(publicPath.endsWith("/")) {
-				int length = publicPath.length();
-				publicPath = publicPath.substring(0, length-1);
-			}
+	public List<String> getIDPPublicPath() throws ConfigurationException {
+		List<String> publicPath = AuthConfigurationProviderFactory.getInstance().getPublicURLPrefix();
+		List<String> returnvalue = new ArrayList<String>();
+		for (String el : publicPath) {
+			if(el.endsWith("/")) {
+				int length = el.length();
+				returnvalue.add(el.substring(0, length-1));
+				
+			} else
+				returnvalue.add(el);
 		}
-		return publicPath;
+		return returnvalue;
 	}
 
-	public String getSPSSOPostService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_SP_POST;
+	public String getSPSSOPostService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_SP_POST;
 	}
 
-	public String getSPSSORedirectService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_SP_REDIRECT;
+	public String getSPSSORedirectService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_SP_REDIRECT;
 	}
 	
-	public String getIDPSSOPostService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_IDP_POST;
+	public String getIDPSSOPostService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_IDP_POST;
 	}
 
-	public String getIDPSSORedirectService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_IDP_REDIRECT;
+	public String getIDPSSORedirectService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_IDP_REDIRECT;
 	}
 	
-	public String getIDPSSOSOAPService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_IDP_SOAP;
+	public String getIDPSSOSOAPService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_IDP_SOAP;
 	}
 	
-	public String getIDPAttributeQueryService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_IDP_ATTRIBUTEQUERY;
+	public String getIDPAttributeQueryService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_IDP_ATTRIBUTEQUERY;
 	}
 		
-	public String getIDPSSOMetadataService() throws ConfigurationException {
-		return getIDPPublicPath() + PVP2_METADATA;
+	public String getIDPSSOMetadataService(String publicURLPrefix) throws ConfigurationException {
+		return publicURLPrefix + PVP2_METADATA;
 	}
 
 	public String getIDPKeyStoreFilename() {