enhancements for generic extensions

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@644 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 14 insertions, 9 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
index 67bdfdfec..5c2e805e7 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
@@ -76,7 +76,8 @@ public class DefaultLoginParameterResolver implements LoginParameterResolver {
     OAConfiguration oaConf,
     AuthenticationData authData,
     String clientIPAddress,
-    boolean businessService) {
+    boolean businessService,
+    String publicURLPrefix) {
 
     Map result = new HashMap();
     
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java b/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
index fe5a51d74..b47389950 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java
@@ -46,6 +46,7 @@ public interface LoginParameterResolver {
 	 * @param authData authentication data
 	 * @param clientIPAddress client IP address
 	 * @param businessService boolean value for recognizing (w)bPK-mode
+	 * @param publicURLPrefix to distinguish different online applications
 	 * @return A map, the keys being header names and values being corresponding header values.
 	 * <br>In case of authentication type <code>"basic-auth"</code>, header fields
 	 * <code>username</code> and <code>password</code>.
@@ -67,6 +68,7 @@ public interface LoginParameterResolver {
 	 * @param authData authentication data
 	 * @param clientIPAddress client IP address
 	 * @param businessService boolean value for recognizing (w)bPK-mode
+	 * @param publicURLPrefix to distinguish different online applications
 	 * @return A map, the keys being parameter names and values being corresponding parameter values.
 	 * <br>In case of authentication type <code>"param-auth"</code>, parameters
 	 * derived from parameter mapping and authentication data provided.
@@ -76,7 +78,8 @@ public interface LoginParameterResolver {
 		OAConfiguration oaConf,
 		AuthenticationData authData,
 		String clientIPAddress,
-		boolean businessService)	throws LoginParameterResolverException, NotAllowedException;
+		boolean businessService,
+		String publicURLPrefix)	throws LoginParameterResolverException, NotAllowedException;
 
 	public void configure(String configuration, Boolean businessService) throws LoginParameterResolverException;
 
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
index eb73a9aa6..4feb1f432 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverEncryptedData.java
@@ -165,8 +165,8 @@ public class XMLLoginParameterResolverEncryptedData implements LoginParameterRes
       this.UN = UN;
       this.PW = PW;
       this.Param1 = Param1;
-      this.Param1 = Param2;
-      this.Param1 = Param3;
+      this.Param2 = Param2;
+      this.Param3 = Param3;
     }
 
     /**
@@ -403,7 +403,8 @@ public class XMLLoginParameterResolverEncryptedData implements LoginParameterRes
     OAConfiguration oaConf,
     AuthenticationData authData,
     String clientIPAddress,
-    boolean businessService) throws LoginParameterResolverException, NotAllowedException {
+    boolean businessService, 
+    String publicURLPrefix) throws LoginParameterResolverException, NotAllowedException {
 
 	Map result = new HashMap();
 	
diff --git a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
index d730ee251..2d39d4a9a 100644
--- a/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
+++ b/id.server/src/at/gv/egovernment/moa/id/proxy/XMLLoginParameterResolverPlainData.java
@@ -125,8 +125,8 @@ public class XMLLoginParameterResolverPlainData
                 this.UN = UN;
                 this.PW = PW;
                 this.Param1 = Param1;
-                this.Param1 = Param2;
-                this.Param1 = Param3;
+                this.Param2 = Param2;
+                this.Param3 = Param3;
             }
     
             /**
@@ -220,7 +220,7 @@ public class XMLLoginParameterResolverPlainData
                         }
                         if(!userFound) //if user is not found then throw NotAllowedException exception
                         {
-                                //TODO MOA-ID proov this with testcases!
+                                //TODO MOA-ID proove this with testcases!
                             Logger.info("XMLLoginParameterResolverPlainData: Person is not allowed No automatic login");
                                 throw new NotAllowedException("XMLLoginParameterResolverPlainData: Person is not allowed No automatic login ", new Object[] { });
                         }
@@ -248,7 +248,7 @@ public class XMLLoginParameterResolverPlainData
                 return result;
         }
 
-        public Map getAuthenticationParameters(OAConfiguration oaConf, AuthenticationData authData, String clientIPAddress, boolean businessService)
+        public Map getAuthenticationParameters(OAConfiguration oaConf, AuthenticationData authData, String clientIPAddress, boolean businessService, String publicURLPrefix)
         {
                 Map result = new HashMap();
                 if(oaConf.getAuthType().equals("param"))