Merge branch 'multiple_IDP_publicURLPrefixes' into moa-id-3.0.0-snapshot

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthConstants.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java

1 files changed, 7 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
index d1582b883..9dee39fe8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
@@ -377,7 +377,7 @@ public class AuthenticationSessionStoreage {
 	}
 	
 	public static void addSSOInformation(String moaSessionID, String SSOSessionID, 
-			SLOInformationInterface SLOInfo, String OAUrl) throws AuthenticationException {
+			SLOInformationInterface SLOInfo, IRequest protocolRequest) throws AuthenticationException {
 		
 		AuthenticatedSessionStore dbsession;
 		Transaction tx =  null;
@@ -412,7 +412,7 @@ public class AuthenticationSessionStoreage {
 				  //check if OA already has an active OA session
 				  if (dbsession.getActiveOAsessions() != null) {
 					for (OASessionStore el : dbsession.getActiveOAsessions()) {
-						if (el.getOaurlprefix().equals(OAUrl))
+						if (el.getOaurlprefix().equals(protocolRequest.getOAURL()))
 							activeOA = el;						
 					}										 
 				  }
@@ -421,7 +421,7 @@ public class AuthenticationSessionStoreage {
 					  activeOA = new OASessionStore();
 				  
 				  //set active OA applications
-				  activeOA.setOaurlprefix(OAUrl);
+				  activeOA.setOaurlprefix(protocolRequest.getOAURL());
 				  activeOA.setMoasession(dbsession);
 				  activeOA.setCreated(new Date());
 				  
@@ -432,6 +432,7 @@ public class AuthenticationSessionStoreage {
 					  activeOA.setUserNameIDFormat(SLOInfo.getUserNameIDFormat());
 					  activeOA.setProtocolType(SLOInfo.getProtocolType());
 					  activeOA.setAttributeQueryUsed(false);
+					  activeOA.setAuthURL(protocolRequest.getAuthURL());
 					  
 					  
 				  }
@@ -463,10 +464,10 @@ public class AuthenticationSessionStoreage {
 					tx.commit();
 					
 					if (SLOInfo != null)
-						Logger.info("Add SSO-Session login information for OA: " + OAUrl 
+						Logger.info("Add SSO-Session login information for OA: " + protocolRequest.getOAURL() 
 								+ " and AssertionID: " + SLOInfo.getSessionIndex());
 					else
-						Logger.info("Add SSO-Session login information for OA: " + OAUrl);
+						Logger.info("Add SSO-Session login information for OA: " + protocolRequest.getOAURL());
 					
 			}
 			
@@ -887,6 +888,7 @@ public class AuthenticationSessionStoreage {
 			idp = new InterfederationSessionStore();
 			idp.setCreated(now);
 			idp.setIdpurlprefix(req.getInterfederationResponse().getEntityID());
+			idp.setAuthURL(req.getAuthURL());
 			
 			try {
 				OAAuthParameter oa = AuthConfigurationProviderFactory.getInstance().