Fixed PVP2 error URL

2 files changed, 13 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index 34becbd49..6055484f7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -193,6 +193,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			config.setOAURL(oaURL);
 			config.setBinding(binding);
 			config.setRequest(moaRequest);
+			config.setConsumerURL(consumerService.getLocation());
 			
 			//TODO: set correct target;
 			config.setTarget(PVPConfiguration.getInstance().getTargetForSP(entityID));
@@ -270,8 +271,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			encoder = new RedirectBinding();
 		}
 
-		//TODO: getOAURL is maybe not a valid ErrorResponse URL
-		encoder.encodeRespone(request, response, samlResponse, protocolRequest.getOAURL());
+		encoder.encodeRespone(request, response, samlResponse, pvpRequest.getConsumerURL());
 		return true;
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
index d15c307a1..d842d5fe0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
@@ -6,6 +6,7 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.binding.MOARequest;
 public class PVPTargetConfiguration extends RequestImpl {
 	MOARequest request;
 	String binding;
+	String consumerURL;
 
 	public MOARequest getRequest() {
 		return request;
@@ -22,4 +23,14 @@ public class PVPTargetConfiguration extends RequestImpl {
 	public void setBinding(String binding) {
 		this.binding = binding;
 	}
+
+	public String getConsumerURL() {
+		return consumerURL;
+	}
+
+	public void setConsumerURL(String consumerURL) {
+		this.consumerURL = consumerURL;
+	}
+	
+	
 }